From 9b4aabdb0f0906f9cc2f38954d048d5e917db093 Mon Sep 17 00:00:00 2001
From: Aaron Griffin <aaron@archlinux.org>
Date: Fri, 3 Nov 2006 03:56:02 +0000
Subject: * Modified some error output and logging * Changed the initial log
 mask (added PM_LOG_ERROR) * Fixed -Syu so it now works if any databases were
 downloaded (it was working   like a -Su)

---
 lib/libalpm/error.h  |  2 +-
 lib/libalpm/server.c |  5 ++---
 src/pacman/log.c     | 25 +++++++++++++++----------
 src/pacman/pacman.c  |  1 +
 src/pacman/sync.c    |  4 +++-
 5 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/lib/libalpm/error.h b/lib/libalpm/error.h
index bee36076..5f53712a 100644
--- a/lib/libalpm/error.h
+++ b/lib/libalpm/error.h
@@ -22,7 +22,7 @@
 #define _ALPM_ERROR_H
 
 #define RET_ERR(err, ret) do { pm_errno = (err); \
-	_alpm_log(PM_LOG_ERROR, _("returning error %d: %s\n"), err, alpm_strerror(err)); \
+	_alpm_log(PM_LOG_DEBUG, _("returning error %d: %s\n"), err, alpm_strerror(err)); \
 	return(ret); } while(0)
 
 #endif /* _ALPM_ERROR_H */
diff --git a/lib/libalpm/server.c b/lib/libalpm/server.c
index 420b4a2e..35905489 100644
--- a/lib/libalpm/server.c
+++ b/lib/libalpm/server.c
@@ -181,9 +181,8 @@ int _alpm_downloadfiles_forreal(pmlist_t *servers, const char *localpath,
 						dlf = fetchXGet(server->s_url, &ust, (handle->nopassiveftp ? "" : "p"));
 				}
 				if(fetchLastErrCode != 0 || dlf == NULL) {
-					_alpm_log(PM_LOG_ERROR, _("failed retrieving file '%s' from '%s://%s%s', %d : %s"), fn,
-										server->s_url->scheme, server->s_url->host, server->s_url->doc, fetchLastErrCode,
-										fetchLastErrString);
+					_alpm_log(PM_LOG_ERROR, _("failed retrieving file '%s' from %s://%s: %s"), fn,
+										server->s_url->scheme, server->s_url->host, fetchLastErrString);
 					if(localf != NULL) {
 						fclose(localf);
 					}
diff --git a/src/pacman/log.c b/src/pacman/log.c
index 17d6965a..67b69324 100644
--- a/src/pacman/log.c
+++ b/src/pacman/log.c
@@ -75,16 +75,21 @@ void cb_log(unsigned short level, char *msg)
 	}
 
 #ifdef PACMAN_DEBUG
-	time_t t;
-	struct tm *tmp;
-	char timestr[10] = {0};
-
-	t = time(NULL);
-	tmp = localtime(&t);
-	strftime(timestr, 9, "%H:%M:%S", tmp);
-	timestr[8] = '\0';
-
-	MSG(NL, "[%s] %s: %s\n", timestr, str, msg);
+	/* If debug is on, we'll timestamp the output */
+  if(config->debug&PM_LOG_DEBUG) {
+		time_t t;
+		struct tm *tmp;
+		char timestr[10] = {0};
+
+		t = time(NULL);
+		tmp = localtime(&t);
+		strftime(timestr, 9, "%H:%M:%S", tmp);
+		timestr[8] = '\0';
+
+		MSG(NL, "[%s] %s: %s\n", timestr, str, msg);
+	} else {
+    MSG(NL, "%s: %s\n", str, msg);
+	}
 #else
 	MSG(NL, "%s: %s\n", str, msg);
 #endif
diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c
index d35c8be0..9259cf9d 100644
--- a/src/pacman/pacman.c
+++ b/src/pacman/pacman.c
@@ -455,6 +455,7 @@ int main(int argc, char *argv[])
 	/* init config data */
 	config = config_new();
 	config->op = PM_OP_MAIN;
+	config->debug |= PM_LOG_ERROR;
 	config->debug |= PM_LOG_WARNING;
 	/* disable progressbar if the output is redirected */
 	if(!isatty(1)) {
diff --git a/src/pacman/sync.c b/src/pacman/sync.c
index 1d1ea29d..113e1675 100644
--- a/src/pacman/sync.c
+++ b/src/pacman/sync.c
@@ -175,6 +175,7 @@ static int sync_synctree(int level, list_t *syncs)
 			}
 		} else if(ret == 1) {
 			MSG(NL, _(" %s is up to date\n"), sync->treename);
+			success++;
 		} else {
 			success++;
 		}
@@ -376,7 +377,8 @@ int pacman_sync(list_t *targets)
 		/* grab a fresh package list */
 		MSG(NL, _(":: Synchronizing package databases...\n"));
 		alpm_logaction(_("synchronizing package lists"));
-		if(sync_synctree(config->op_s_sync, pmc_syncs)) {
+		if(!sync_synctree(config->op_s_sync, pmc_syncs)) {
+			ERR(NL, _("failed to synchronize any databases"));
 			return(1);
 		}
 	}
-- 
cgit v1.2.3-70-g09d2