bryson/pacman
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'maint'

Browse source
This commit is contained in:
Dan McGee 2009-01-18 13:48:48 -06:00
commit c794661f1e
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/libalpm/add.c
View file

@ -292,12 +292,12 @@ static int extract_single_file(struct archive *archive,
/* the install script goes inside the db */ /* the install script goes inside the db */
snprintf(filename, PATH_MAX, "%s%s-%s/install", db->path, snprintf(filename, PATH_MAX, "%s%s-%s/install", db->path,
newpkg->name, newpkg->version); newpkg->name, newpkg->version);
archive_entry_set_mode(entry, 0644); archive_entry_set_perm(entry, 0644);
} else if(strcmp(entryname, ".CHANGELOG") == 0) { } else if(strcmp(entryname, ".CHANGELOG") == 0) {
/* the changelog goes inside the db */ /* the changelog goes inside the db */
snprintf(filename, PATH_MAX, "%s%s-%s/changelog", db->path, snprintf(filename, PATH_MAX, "%s%s-%s/changelog", db->path,
newpkg->name, newpkg->version); newpkg->name, newpkg->version);
archive_entry_set_mode(entry, 0644); archive_entry_set_perm(entry, 0644);
} else if(*entryname == '.') { } else if(*entryname == '.') {
/* for now, ignore all files starting with '.' that haven't /* for now, ignore all files starting with '.' that haven't
* already been handled (for future possibilities) */ * already been handled (for future possibilities) */

4
lib/libalpm/util.c
View file

@ -321,9 +321,9 @@ int _alpm_unpack(const char *archive, const char *prefix, const char *fn)
entryname = archive_entry_pathname(entry); entryname = archive_entry_pathname(entry);
if(S_ISREG(st->st_mode)) { 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)) { } 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. */ /* If a specific file was requested skip entries that don't match. */