[pacman-dev] CVS update of pacman-lib/src/pacman (log.c sync.c)

[Aaron Griffin]

    Date: Thursday, February 15, 2007 @ 21:21:13
  Author: aaron
    Path: /home/cvs-pacman/pacman-lib/src/pacman

Modified: log.c (1.29 -> 1.30) sync.c (1.111 -> 1.112)

* 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


--------+
 log.c  |    6 +++---
 sync.c |    6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)


Index: pacman-lib/src/pacman/log.c
diff -u pacman-lib/src/pacman/log.c:1.29 pacman-lib/src/pacman/log.c:1.30
--- pacman-lib/src/pacman/log.c:1.29	Sat Feb 10 04:34:59 2007
+++ pacman-lib/src/pacman/log.c	Thu Feb 15 21:21:13 2007
@@ -89,12 +89,12 @@
 		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
 }
 
Index: pacman-lib/src/pacman/sync.c
diff -u pacman-lib/src/pacman/sync.c:1.111 pacman-lib/src/pacman/sync.c:1.112
--- pacman-lib/src/pacman/sync.c:1.111	Thu Feb 15 20:58:51 2007
+++ pacman-lib/src/pacman/sync.c	Thu Feb 15 21:21:13 2007
@@ -340,7 +340,7 @@
 				}
 				
 				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 @@
 				}
 				
 				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 @@
 					}
 				}
 				if(!foundpkg) {
-					ERR(NL, _("package '%s' was not found."), pkgstr);
+					ERR(NL, _("package '%s' was not found\n"), pkgstr);
 				}
 			}
 		}