mirror of
https://github.com/moparisthebest/pacman
synced 2024-12-22 15:58:50 -05:00
Merge branch 'maint'
This commit is contained in:
commit
c794661f1e
@ -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) */
|
||||
|
@ -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. */
|
||||
|
Loading…
Reference in New Issue
Block a user