diff options
Diffstat (limited to 'lib/libalpm')
| -rw-r--r-- | lib/libalpm/be_sync.c | 2 | ||||
| -rw-r--r-- | lib/libalpm/po/libalpm.pot | 18 | ||||
| -rw-r--r-- | lib/libalpm/sync.c | 2 | ||||
| -rw-r--r-- | lib/libalpm/util.c | 7 |
4 files changed, 7 insertions, 22 deletions
diff --git a/lib/libalpm/be_sync.c b/lib/libalpm/be_sync.c index 21914944..5faf0b8d 100644 --- a/lib/libalpm/be_sync.c +++ b/lib/libalpm/be_sync.c @@ -223,7 +223,7 @@ static int sync_db_populate(pmdb_t *db) if(archive_read_open_filename(archive, _alpm_db_path(db), ARCHIVE_DEFAULT_BYTES_PER_BLOCK) != ARCHIVE_OK) { - _alpm_log(PM_LOG_ERROR, _("could not open %s: %s\n"), _alpm_db_path(db), + _alpm_log(PM_LOG_ERROR, _("could not open file %s: %s\n"), _alpm_db_path(db), archive_error_string(archive)); archive_read_finish(archive); RET_ERR(PM_ERR_DB_OPEN, 1); diff --git a/lib/libalpm/po/libalpm.pot b/lib/libalpm/po/libalpm.pot index b3edb22b..560b7bf4 100644 --- a/lib/libalpm/po/libalpm.pot +++ b/lib/libalpm/po/libalpm.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: pacman 3.4.3\n" "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n" -"POT-Creation-Date: 2011-02-28 11:09-0600\n" +"POT-Creation-Date: 2011-02-28 17:48-0600\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -152,10 +152,6 @@ msgid "removing invalid file: %s\n" msgstr "" #, c-format -msgid "could not open %s: %s\n" -msgstr "" - -#, c-format msgid "database path is undefined\n" msgstr "" @@ -484,10 +480,6 @@ msgid "failed to retrieve some files from %s\n" msgstr "" #, c-format -msgid "not enough free disk space\n" -msgstr "" - -#, c-format msgid "could not commit removal transaction\n" msgstr "" @@ -516,10 +508,6 @@ msgid "could not remove tmpdir %s\n" msgstr "" #, c-format -msgid "warning given while extracting %s (%s)\n" -msgstr "" - -#, c-format msgid "could not create pipe (%s)\n" msgstr "" @@ -532,10 +520,6 @@ msgid "could not change the root directory (%s)\n" msgstr "" #, c-format -msgid "could not change directory to / (%s)\n" -msgstr "" - -#, c-format msgid "call to execv failed (%s)\n" msgstr "" diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index fdd37608..29197807 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -900,7 +900,7 @@ int _alpm_sync_commit(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t **data) _alpm_log(PM_LOG_DEBUG, "checking available disk space\n"); if(_alpm_check_diskspace(trans, handle->db_local) == -1) { - _alpm_log(PM_LOG_ERROR, _("not enough free disk space\n")); + _alpm_log(PM_LOG_ERROR, "%s\n", _("not enough free disk space")); goto error; } diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index 9281f0e6..74e14058 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -262,7 +262,7 @@ int _alpm_unpack(const char *archive, const char *prefix, alpm_list_t *list, int if(archive_read_open_filename(_archive, archive, ARCHIVE_DEFAULT_BYTES_PER_BLOCK) != ARCHIVE_OK) { - _alpm_log(PM_LOG_ERROR, _("could not open %s: %s\n"), archive, + _alpm_log(PM_LOG_ERROR, _("could not open file %s: %s\n"), archive, archive_error_string(_archive)); RET_ERR(PM_ERR_PKG_OPEN, 1); } @@ -320,7 +320,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_WARNING, _("warning given while extracting %s (%s)\n"), + _alpm_log(PM_LOG_WARNING, _("warning given when 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"), @@ -474,7 +474,8 @@ int _alpm_run_chroot(const char *root, const char *path, char *const argv[]) exit(1); } if(chdir("/") != 0) { - fprintf(stderr, _("could not change directory to / (%s)\n"), strerror(errno)); + fprintf(stderr, _("could not change directory to %s (%s)\n"), + "/", strerror(errno)); exit(1); } umask(0022); |