moparisthebest/pacman
1
0
Fork 0
mirror of https://github.com/moparisthebest/pacman synced 2024-11-11 20:05:07 -05:00
Code Issues Releases Wiki Activity

libalpm/add.c : fix backup handling (2)

Browse Source 
The mistake fixed in commit 26441cf65c
was actually done at two places.
This fix the second one.

Also remove one unnecessary newline introduced by
commit d34b2c4ed8

Signed-off-by: Chantry Xavier <shiningxc@gmail.com>
This commit is contained in:
Chantry Xavier 2007-09-18 20:46:41 +02:00 committed by Dan McGee
parent 1860ab8980
commit f9b7c67d24
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/libalpm/add.c
View File

@ -416,7 +416,7 @@ static int extract_single_file(struct archive *archive,
"filesystem: %o package: %o\n"), entryname, lsbuf.st_mode & mask, "filesystem: %o package: %o\n"), entryname, lsbuf.st_mode & mask,
entrymode & mask); entrymode & mask);
alpm_logaction("warning: directory permissions differ on %s\n" alpm_logaction("warning: directory permissions differ on %s\n"
"filesystem: %o package: %o\n", entryname, lsbuf.st_mode & mask, "filesystem: %o package: %o", entryname, lsbuf.st_mode & mask,
entrymode & mask); entrymode & mask);
} }
_alpm_log(PM_LOG_DEBUG, "extract: skipping dir extraction of %s\n", _alpm_log(PM_LOG_DEBUG, "extract: skipping dir extraction of %s\n",
@ -659,7 +659,7 @@ static int extract_single_file(struct archive *archive,
int backup_len = strlen(oldbackup) + 34; int backup_len = strlen(oldbackup) + 34;
if(!oldbackup || strcmp(oldbackup, entryname) != 0) { if(!oldbackup || strcmp(oldbackup, entryname) != 0) {
return(0); continue;
} }
_alpm_log(PM_LOG_DEBUG, "appending backup entry for %s\n", filename); _alpm_log(PM_LOG_DEBUG, "appending backup entry for %s\n", filename);