* Fix FS #3107- Use ISO date style

* Fix FS #5409- document that pacman.conf repo ordering is important

Signed-off-by: Dan McGee <dpmcgee@gmail.com>

2 files changed, 8 insertions, 5 deletions

diff --git a/etc/pacman.conf.in b/etc/pacman.conf.in
index 5935144b..fcdd65d8 100644
--- a/etc/pacman.conf.in
+++ b/etc/pacman.conf.in
@@ -21,7 +21,9 @@ HoldPkg     = pacman glibc
 #   - can be defined here or included from another file
 #   - pacman will search repositories in the order defined here
 #   - local/custom mirrors can be added here or in separate files
-
+#   - repositories listed first will take precedence when packages
+#     have identical names, regardless of version number
+#
 #[testing]
 #Server = ftp://ftp.archlinux.org/testing/os/i686
 
diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c
index ce9083d5..ce3bc85b 100644
--- a/lib/libalpm/util.c
+++ b/lib/libalpm/util.c
@@ -357,10 +357,11 @@ int _alpm_logaction(unsigned short usesyslog, FILE *f, const char *str)
 		t = time(NULL);
 		tm = localtime(&t);
 
-		fprintf(f, "[%02d/%02d/%02d %02d:%02d] %s\n",
-		        tm->tm_mon+1, tm->tm_mday, tm->tm_year-100,
-		        tm->tm_hour, tm->tm_min,
-		        str);
+		/* Use ISO-8601 date format */
+		fprintf(f, "[%04d-%02d-%02d %02d:%02d] %s\n",
+						tm->tm_year+1900, tm->tm_mon+1, tm->tm_mday,
+						tm->tm_hour, tm->tm_min, str);
+
 		fflush(f);
 	}