mirror of
https://github.com/moparisthebest/pacman
synced 2024-11-11 20:05:07 -05:00
libalpm/add.c : fix backup handling (2)
The mistake fixed in commit26441cf65c
was actually done at two places. This fix the second one. Also remove one unnecessary newline introduced by commitd34b2c4ed8
Signed-off-by: Chantry Xavier <shiningxc@gmail.com>
This commit is contained in:
parent
1860ab8980
commit
f9b7c67d24
@ -416,7 +416,7 @@ static int extract_single_file(struct archive *archive,
|
||||
"filesystem: %o package: %o\n"), entryname, lsbuf.st_mode & mask,
|
||||
entrymode & mask);
|
||||
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);
|
||||
}
|
||||
_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;
|
||||
|
||||
if(!oldbackup || strcmp(oldbackup, entryname) != 0) {
|
||||
return(0);
|
||||
continue;
|
||||
}
|
||||
_alpm_log(PM_LOG_DEBUG, "appending backup entry for %s\n", filename);
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user