diff options
| author | Dan McGee <dan@archlinux.org> | 2008-01-21 19:42:08 -0600 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2008-01-21 19:42:08 -0600 |
| commit | cbcf542ad22c479f3e0be9698e13c52687953ec9 (patch) | |
| tree | 3c44f5cf4045a852bad363560e98a32b4f0816a3 /src | |
| parent | 2a7101c049dd1874da09d7d120f8855c61e55809 (diff) | |
| parent | bba62655fe06989e89576e66a97607da88aa9916 (diff) | |
| download | pacman-cbcf542ad22c479f3e0be9698e13c52687953ec9.tar.xz | |
Merge branch 'maint'
Diffstat (limited to 'src')
| -rw-r--r-- | src/pacman/add.c | 2 | ||||
| -rw-r--r-- | src/pacman/callback.c | 2 | ||||
| -rw-r--r-- | src/pacman/util.c | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/pacman/add.c b/src/pacman/add.c index 80366de1..975d26be 100644 --- a/src/pacman/add.c +++ b/src/pacman/add.c @@ -146,7 +146,7 @@ int pacman_add(alpm_list_t *targets) case PM_ERR_CONFLICTING_DEPS: for(i = data; i; i = alpm_list_next(i)) { pmconflict_t *conflict = alpm_list_getdata(i); - printf(_(":: %s: conflicts with %s"), + printf(_(":: %s: conflicts with %s\n"), alpm_conflict_get_package1(conflict), alpm_conflict_get_package2(conflict)); } break; diff --git a/src/pacman/callback.c b/src/pacman/callback.c index 9742d7f0..268a8a7f 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -285,7 +285,7 @@ void cb_trans_conv(pmtransconv_t event, void *data1, void *data2, alpm_pkg_get_name(data2)); *response = yesno(str); } else { - printf(_("Replacing %s with %s/%s\n."), + printf(_("Replacing %s with %s/%s\n"), alpm_pkg_get_name(data1), (char *)data3, alpm_pkg_get_name(data2)); diff --git a/src/pacman/util.c b/src/pacman/util.c index a3ac66a7..19e64442 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -544,7 +544,7 @@ int pm_vasprintf(char **string, pmloglevel_t level, const char *format, va_list /* print a prefix to the message */ switch(level) { case PM_LOG_DEBUG: - asprintf(string, _("debug: %s"), msg); + asprintf(string, "debug: %s", msg); break; case PM_LOG_ERROR: asprintf(string, _("error: %s"), msg); @@ -591,7 +591,7 @@ int pm_vfprintf(FILE *stream, pmloglevel_t level, const char *format, va_list ar /* print a prefix to the message */ switch(level) { case PM_LOG_DEBUG: - fprintf(stream, _("debug: ")); + fprintf(stream, "debug: "); break; case PM_LOG_ERROR: fprintf(stream, _("error: ")); |