emo/xbps
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve previous and only overwrite files while upgrading packages in the

Browse Source 
unpack phase.

--HG--
extra : convert_revision : xtraeme%40gmail.com-20100128152108-vfs98fe3wvtort4s
This commit is contained in:
Juan RP
2010-01-28 16:21:08 +01:00
parent 61dde1ac02
commit df5b800366
2 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
NEWS
View File

@ -47,7 +47,7 @@ xbps-0.4 (2010-02-01):
If set, files will be removed even if its hash doesn't match for the If set, files will be removed even if its hash doesn't match for the
'remove' target, and configuration files for the 'purge' target. 'remove' target, and configuration files for the 'purge' target.
* libxbps: always overwrite files while unpacking, and compare old and * libxbps: if updating a package, always overwrite files while unpacking;
new files to remove obsoletes if necessary. This makes the "essential" compare old and new files to remove obsoletes if necessary. This makes
object in package dictionary unnecessary, because all packages are the "essential" object in package dictionary unnecessary, because all
treated as they were essential. packages are treated as they were essential.

21
lib/unpack.c
View File

@ -65,13 +65,24 @@
*/ */
static void static void
set_extract_flags(int *flags) set_extract_flags(int *flags, bool update)
{ {
*flags = 0; int lflags = 0;
if (getuid() == 0) if (getuid() == 0)
*flags = FEXTRACT_FLAGS; lflags = FEXTRACT_FLAGS;
else else
*flags = EXTRACT_FLAGS; lflags = EXTRACT_FLAGS;
if (!update) {
/*
* Only overwrite files while updating.
*/
lflags |= ARCHIVE_EXTRACT_NO_OVERWRITE;
lflags |= ARCHIVE_EXTRACT_NO_OVERWRITE_NEWER;
}
*flags = lflags;
} }
/* /*
@ -152,7 +163,7 @@ unpack_archive_fini(struct archive *ar, prop_dictionary_t pkg)
*/ */
while (archive_read_next_header(ar, &entry) == ARCHIVE_OK) { while (archive_read_next_header(ar, &entry) == ARCHIVE_OK) {
entry_str = archive_entry_pathname(entry); entry_str = archive_entry_pathname(entry);
set_extract_flags(&lflags); set_extract_flags(&lflags, update);
/* /*
* Run the pre INSTALL action if the file is there. * Run the pre INSTALL action if the file is there.
*/ */