From 17e72ff8826d4c0569f09998f6e7b48c855f065a Mon Sep 17 00:00:00 2001 From: Aaron Griffin Date: Fri, 16 Feb 2007 02:21:13 +0000 Subject: * Bugfix FS#6422 - spacing for warning output. Due to the fact that we fixed MSG/ERR usage earlier, the trailing '\n's are no longer needed * Oddly enough - *ADDED* some '\n's to the sync_info errors (last commit) as the package info output does not use the pm_fprintf facility and thus does not honor our newline/no-newline setup --- src/pacman/log.c | 6 +++--- src/pacman/sync.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/pacman/log.c b/src/pacman/log.c index 9b2e9bc3..a639159f 100644 --- a/src/pacman/log.c +++ b/src/pacman/log.c @@ -89,12 +89,12 @@ void cb_log(unsigned short level, char *msg) strftime(timestr, 9, "%H:%M:%S", tmp); timestr[8] = '\0'; - MSG(NL, "[%s] %s: %s\n", timestr, str, msg); + MSG(NL, "[%s] %s: %s", timestr, str, msg); } else { - MSG(NL, "%s: %s\n", str, msg); + MSG(NL, "%s: %s", str, msg); } #else - MSG(NL, "%s: %s\n", str, msg); + MSG(NL, "%s: %s", str, msg); #endif } diff --git a/src/pacman/sync.c b/src/pacman/sync.c index eedcd96e..ec42bce2 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -340,7 +340,7 @@ static int sync_info(alpm_list_t *syncs, alpm_list_t *targets) } if(!db) { - ERR(NL, _("repository '%s' does not exist"), repo); + ERR(NL, _("repository '%s' does not exist\n"), repo); return(1); } @@ -356,7 +356,7 @@ static int sync_info(alpm_list_t *syncs, alpm_list_t *targets) } if(!foundpkg) { - ERR(NL, _("package '%s' was not found in repository '%s'"), pkgstr, repo); + ERR(NL, _("package '%s' was not found in repository '%s'\n"), pkgstr, repo); } } else { pkgstr = target; @@ -376,7 +376,7 @@ static int sync_info(alpm_list_t *syncs, alpm_list_t *targets) } } if(!foundpkg) { - ERR(NL, _("package '%s' was not found."), pkgstr); + ERR(NL, _("package '%s' was not found\n"), pkgstr); } } } -- cgit v1.2.3-24-g4f1b