summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2013-01-29 04:22:42 +0100
committerAllan McRae <allan@archlinux.org>2013-01-29 04:37:32 +0100
commit3aece8f0eedd703349bcd7bd6bf4b221d9f5775c (patch)
tree2afa7ee74edee5d0e5ee6062f2306c95fab086df /src
parente1e4bbb79ddd23e46b8d3a01168f4eb410308d5b (diff)
downloadpacman-3aece8f0eedd703349bcd7bd6bf4b221d9f5775c.tar.gz
pacman-3aece8f0eedd703349bcd7bd6bf4b221d9f5775c.tar.xz
Restore libarchive 2.8.x compatibility
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. Allan: Adjusted with respect to previous patches adding libarchive compatibilty layer. Signed-off-by: Allan McRae <allan@archlinux.org>
Diffstat (limited to 'src')
-rw-r--r--src/pacman/check.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/pacman/check.c b/src/pacman/check.c
index 92ce05c9..d7fe2d66 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"),