summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2009-01-18 20:48:48 +0100
committerDan McGee <dan@archlinux.org>2009-01-18 20:48:48 +0100
commitc794661f1ea8c819d479948e92e5648de62787c5 (patch)
treef7570d87f370f1cdfe04ec72e0719120f41b9e34
parent8929769902597f109fc6b49609fb64121becb197 (diff)
parent472e51b975b9cb8fe1f67c03ff72bbc067fa7f01 (diff)
downloadpacman-c794661f1ea8c819d479948e92e5648de62787c5.tar.gz
pacman-c794661f1ea8c819d479948e92e5648de62787c5.tar.xz
Merge branch 'maint'
-rw-r--r--lib/libalpm/add.c4
-rw-r--r--lib/libalpm/util.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c
index 264a28ee..6eb2085e 100644
--- a/lib/libalpm/add.c
+++ b/lib/libalpm/add.c
@@ -292,12 +292,12 @@ static int extract_single_file(struct archive *archive,
/* the install script goes inside the db */
snprintf(filename, PATH_MAX, "%s%s-%s/install", db->path,
newpkg->name, newpkg->version);
- archive_entry_set_mode(entry, 0644);
+ archive_entry_set_perm(entry, 0644);
} else if(strcmp(entryname, ".CHANGELOG") == 0) {
/* the changelog goes inside the db */
snprintf(filename, PATH_MAX, "%s%s-%s/changelog", db->path,
newpkg->name, newpkg->version);
- archive_entry_set_mode(entry, 0644);
+ archive_entry_set_perm(entry, 0644);
} else if(*entryname == '.') {
/* for now, ignore all files starting with '.' that haven't
* already been handled (for future possibilities) */
diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c
index 5e6ca0c0..1bec6344 100644
--- a/lib/libalpm/util.c
+++ b/lib/libalpm/util.c
@@ -321,9 +321,9 @@ int _alpm_unpack(const char *archive, const char *prefix, const char *fn)
entryname = archive_entry_pathname(entry);
if(S_ISREG(st->st_mode)) {
- archive_entry_set_mode(entry, 0644);
+ archive_entry_set_perm(entry, 0644);
} else if(S_ISDIR(st->st_mode)) {
- archive_entry_set_mode(entry, 0755);
+ archive_entry_set_perm(entry, 0755);
}
/* If a specific file was requested skip entries that don't match. */