diff options
| author | Dan McGee <dan@archlinux.org> | 2012-12-17 19:38:44 -0600 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2012-12-17 19:38:44 -0600 |
| commit | e5dda2778a2ae1b59fc3e213a4ec2dd92d58ee65 (patch) | |
| tree | 7cd014bcfb8488f87ee285884f4f40625381cddf | |
| parent | 5186f702d3d426eec8a2c84bb2a8556ffa9e0736 (diff) | |
| download | pacman-libarchive-2.8.tar.gz pacman-libarchive-2.8.zip | |
Restore libarchive 2.8.x compatibilitylibarchive-2.8
We still call some of these 'deprecated' methods elsewhere, so this
shouldn't present a problem. When we decide 2.x support is to be
dropped, we should update all of the code to not call deprecated
methods.
Signed-off-by: Dan McGee <dan@archlinux.org>
| -rw-r--r-- | lib/libalpm/be_local.c | 2 | ||||
| -rw-r--r-- | src/pacman/check.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/libalpm/be_local.c b/lib/libalpm/be_local.c index 6d47fa88..d6604ec3 100644 --- a/lib/libalpm/be_local.c +++ b/lib/libalpm/be_local.c @@ -238,7 +238,7 @@ static struct archive *_cache_mtree_open(alpm_pkg_t *pkg) goto error; } - archive_read_support_filter_gzip(mtree); + archive_read_support_compression_all(mtree); archive_read_support_format_mtree(mtree); if((r = archive_read_open_file(mtree, mtfile, ALPM_BUFFER_SIZE))) { diff --git a/src/pacman/check.c b/src/pacman/check.c index 78841c60..6226d731 100644 --- a/src/pacman/check.c +++ b/src/pacman/check.c @@ -90,7 +90,7 @@ static int check_file_permissions(const char *pkgname, const char *filepath, /* mode */ fsmode = st->st_mode & (S_ISUID | S_ISGID | S_ISVTX | S_IRWXU | S_IRWXG | S_IRWXO); - if(fsmode != archive_entry_perm(entry)) { + if(fsmode != (~AE_IFMT & archive_entry_mode(entry))) { errors++; if(!config->quiet) { pm_printf(ALPM_LOG_WARNING, _("%s: %s (Permissions mismatch)\n"), |