diff options
| author | Chantry Xavier <shiningxc@gmail.com> | 2007-09-18 20:46:41 +0200 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2007-09-19 01:56:40 +0200 |
| commit | f9b7c67d24210dc4b2c77b751948e0f17f80583f (patch) | |
| tree | 196b3c27790d48340a7eb9a0a903411f15785b99 | |
| parent | 1860ab898086096ef0d9aad66e29f86cbf271423 (diff) | |
| download | pacman-f9b7c67d24210dc4b2c77b751948e0f17f80583f.tar.gz pacman-f9b7c67d24210dc4b2c77b751948e0f17f80583f.tar.xz | |
libalpm/add.c : fix backup handling (2)
The mistake fixed in commit 26441cf65ca10d4bf218203df5db5e8a7270787b
was actually done at two places.
This fix the second one.
Also remove one unnecessary newline introduced by
commit d34b2c4ed84bc40f4a895846785481fad88116a2
Signed-off-by: Chantry Xavier <shiningxc@gmail.com>
| -rw-r--r-- | lib/libalpm/add.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c index 97ce01e5..e9225da1 100644 --- a/lib/libalpm/add.c +++ b/lib/libalpm/add.c @@ -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); |