diff options
| author | Dan McGee <dan@archlinux.org> | 2008-10-13 04:08:39 +0200 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2010-12-13 04:42:41 +0100 |
| commit | b276a76dc9e02e1cdc227661ae4ffe97a24d9f4d (patch) | |
| tree | 18badc62a62c7a5fcb97ebbbf0831af60e5def9b | |
| parent | 3030542d10d4e87997a894a9eb63122cd2426a94 (diff) | |
| download | pacman-b276a76dc9e02e1cdc227661ae4ffe97a24d9f4d.tar.gz pacman-b276a76dc9e02e1cdc227661ae4ffe97a24d9f4d.tar.xz | |
Turn libarchive warnings into libalpm warnings
Rather than hiding these warnings, show them to the user as they happen.
This will prevent things such as hiding full filesystem errors (ENOSPC) from
the user as seen in FS#11639.
Signed-off-by: Dan McGee <dan@archlinux.org>
[Allan: adjust warning wording and add gettext calls]
Signed-off-by: Allan McRae <allan@archlinux.org>
Signed-off-by: Dan McGee <dan@archlinux.org>
| -rw-r--r-- | lib/libalpm/add.c | 4 | ||||
| -rw-r--r-- | lib/libalpm/util.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c index 2b6b019b..dfd30020 100644 --- a/lib/libalpm/add.c +++ b/lib/libalpm/add.c @@ -281,7 +281,7 @@ static int extract_single_file(struct archive *archive, ret = archive_read_extract(archive, entry, archive_flags); if(ret == ARCHIVE_WARN) { /* operation succeeded but a non-critical error was encountered */ - _alpm_log(PM_LOG_DEBUG, "warning extracting %s (%s)\n", + _alpm_log(PM_LOG_WARNING, _("warning given when extracting %s (%s)\n"), entryname_orig, archive_error_string(archive)); } else if(ret != ARCHIVE_OK) { _alpm_log(PM_LOG_ERROR, _("could not extract %s (%s)\n"), @@ -434,7 +434,7 @@ static int extract_single_file(struct archive *archive, ret = archive_read_extract(archive, entry, archive_flags); if(ret == ARCHIVE_WARN) { /* operation succeeded but a non-critical error was encountered */ - _alpm_log(PM_LOG_DEBUG, "warning extracting %s (%s)\n", + _alpm_log(PM_LOG_WARNING, _("warning given when extracting %s (%s)\n"), entryname_orig, archive_error_string(archive)); } else if(ret != ARCHIVE_OK) { _alpm_log(PM_LOG_ERROR, _("could not extract %s (%s)\n"), diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index 26612418..e425fa48 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -360,7 +360,7 @@ int _alpm_unpack(const char *archive, const char *prefix, alpm_list_t *list, int int readret = archive_read_extract(_archive, entry, 0); if(readret == ARCHIVE_WARN) { /* operation succeeded but a non-critical error was encountered */ - _alpm_log(PM_LOG_DEBUG, "warning extracting %s (%s)\n", + _alpm_log(PM_LOG_WARNING, _("warning given while extracting %s (%s)\n"), entryname, archive_error_string(_archive)); } else if(readret != ARCHIVE_OK) { _alpm_log(PM_LOG_ERROR, _("could not extract %s (%s)\n"), |