moparisthebest/pacman
1
0
Fork 0
mirror of https://github.com/moparisthebest/pacman synced 2025-01-09 13:07:58 -05:00
Code Issues Releases Wiki Activity

libalpm/add.c : ignore libarchive warning.

Browse Source 
With libarchive 2.2.3 (previously 1.3.1), archive_read_extract now returns ARCHIVE_WARN
when a package is extracted as user, because for example, UID=0 or SUID bit can't be set.
This patch makes pacman not treating these warnings as errors anymore,
but simply ignoring them.

Signed-off-by: Chantry Xavier <shiningxc@gmail.com>
This commit is contained in:
Chantry Xavier 2007-06-28 19:28:34 +02:00
parent 1a3b3bc130
commit 2657a2bfb7
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lib/libalpm/add.c
View File

@ -544,11 +544,12 @@ int _alpm_add_commit(pmtrans_t *trans, pmdb_t *db)
archive_entry_set_pathname(entry, tempfile); archive_entry_set_pathname(entry, tempfile);
if(archive_read_extract(archive, entry, archive_flags) != ARCHIVE_OK) { int ret = archive_read_extract(archive, entry, archive_flags);
if(ret != ARCHIVE_OK && ret != ARCHIVE_WARN) {
_alpm_log(PM_LOG_ERROR, _("could not extract %s (%s)"), _alpm_log(PM_LOG_ERROR, _("could not extract %s (%s)"),
entryname, strerror(errno)); entryname, archive_error_string(archive));
alpm_logaction(_("could not extract %s (%s)"), alpm_logaction(_("could not extract %s (%s)"),
entryname, strerror(errno)); entryname, archive_error_string(archive));
errors++; errors++;
unlink(tempfile); unlink(tempfile);
FREE(hash_orig); FREE(hash_orig);
@ -699,10 +700,14 @@ int _alpm_add_commit(pmtrans_t *trans, pmdb_t *db)
archive_entry_set_pathname(entry, filename); archive_entry_set_pathname(entry, filename);
if(archive_read_extract(archive, entry, archive_flags) != ARCHIVE_OK) { int ret = archive_read_extract(archive, entry, archive_flags);
_alpm_log(PM_LOG_ERROR, _("could not extract %s (%s)"), filename, strerror(errno)); if(ret != ARCHIVE_OK && ret != ARCHIVE_WARN) {
alpm_logaction(_("error: could not extract %s (%s)"), filename, strerror(errno)); _alpm_log(PM_LOG_ERROR, _("could not extract %s (%s)"),
entryname, archive_error_string(archive));
alpm_logaction(_("could not extract %s (%s)"),
entryname, archive_error_string(archive));
errors++; errors++;
continue;
} }
/* calculate an hash if this is in newpkg's backup */ /* calculate an hash if this is in newpkg's backup */