Date: Thursday, January 25, 2007 @ 20:33:03 Author: aaron Path: /home/cvs-pacman/pacman-lib Modified: etc/pacman.conf.in (1.3 -> 1.4) lib/libalpm/util.c (1.40 -> 1.41) * 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> --------------------+ etc/pacman.conf.in | 4 +++- lib/libalpm/util.c | 9 +++++---- 2 files changed, 8 insertions(+), 5 deletions(-) Index: pacman-lib/etc/pacman.conf.in diff -u pacman-lib/etc/pacman.conf.in:1.3 pacman-lib/etc/pacman.conf.in:1.4 --- pacman-lib/etc/pacman.conf.in:1.3 Thu Dec 21 12:51:50 2006 +++ pacman-lib/etc/pacman.conf.in Thu Jan 25 20:33:03 2007 @@ -21,7 +21,9 @@ # - 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 Index: pacman-lib/lib/libalpm/util.c diff -u pacman-lib/lib/libalpm/util.c:1.40 pacman-lib/lib/libalpm/util.c:1.41 --- pacman-lib/lib/libalpm/util.c:1.40 Tue Jan 23 22:02:54 2007 +++ pacman-lib/lib/libalpm/util.c Thu Jan 25 20:33:03 2007 @@ -357,10 +357,11 @@ 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); }