[pacman-dev] [patch] Fix FS #3107 (Use ISO style dates), FS #5409 (document pacman.conf order is relevent)

Dan McGee dpmcgee at gmail.com
Thu Jan 25 01:09:02 EST 2007

* Fix FS #3107- Use ISO date style
* Fix FS #5409- document that pacman.conf repo ordering is important

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

--- doc/pacman.8.in	3143c0f4de3cd5ca7ddbf100690e91a8d3d7f7b6
+++ doc/pacman.8.in	e9a8f44c7a2ced2b3594bd41a6f60dd1a026a144
@@ -305,6 +305,9 @@ shown above.
 follow a URL naming structure.  Currently only ftp is supported for
remote servers.  If you
 want to use a local directory, you can specify the full path with a
'file://' prefix, as
 shown above.
+The order of repositories in the file matters; repositories listed first will
+take precidence over those listed later in the file when packages in two
+repositories have identical names, regardless of version number.
 Let's say you have a bunch of custom packages in \fI/home/pkgs\fP and
their respective PKGBUILD
 files are all in \fI/var/abs/local\fP.  All you need to do is
generate a compressed package database
--- etc/pacman.conf.in	f0a4dc45658de05f03658969dc81136801736229
+++ etc/pacman.conf.in	de8076ec76dd59832b10616c782e471e2d1d5ed7
@@ -21,6 +21,8 @@ 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

 #Server = ftp://ftp.archlinux.org/testing/os/i686
--- lib/libalpm/util.c	1749c1006346422efcc2257de4ff96e74ebc9336
+++ lib/libalpm/util.c	0a2ce942c427b52148f0dfab02a3c3dd5cc15b67
@@ -357,10 +357,10 @@ int _alpm_logaction(unsigned short usesy
 		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);

More information about the pacman-dev mailing list