Imported from pacman-2.6.4.tar.gz

ChangeLog

@@ -1,5 +1,6 @@
 VERSION         DESCRIPTION
 -----------------------------------------------------------------------------
+2.6.4         - Altered pacman_upgrade() to allow a package to replace itself
 2.6.3         - A couple memory fixes in the new replaces code
 2.6.2         - Fixed a memory cleanup bug
               - Aurelien's patch:

Makefile.in

@@ -34,7 +34,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 
-PACVER = 2.6.3
+PACVER = 2.6.4
 
 TOPDIR = @srcdir@
 SRCDIR = $(TOPDIR)/src/

scripts/gensync

@@ -20,7 +20,7 @@
 #   USA.
 #
 
-myver='2.6.3'
+myver='2.6.4'
 
 usage() {
   echo "gensync $myver"

scripts/makepkg

@@ -20,7 +20,7 @@
 #   USA.
 #
 
-myver='2.6.3'
+myver='2.6.4'
 startdir=`pwd`
 
 # source Arch's abs.conf if it's present

scripts/makeworld

@@ -21,7 +21,7 @@
 #
 
 toplevel=`pwd`
-version="2.6.3"
+version="2.6.4"
 
 usage() {
 	echo "makeworld version $version"

src/pacman.c

@@ -1226,6 +1226,7 @@ int pacman_add(pacdb_t *db, PMList *targets)
 				/* we'll need the full record for backup checks later */
 				oldpkg = db_scan(db, info->name, INFRQ_ALL);
 
+				if(oldpkg) {
 					list_add(tmp, strdup(info->name));
 					vprint("removing old package first...\n");
 					retcode = pacman_remove(db, tmp);
@@ -1236,6 +1237,7 @@ int pacman_add(pacdb_t *db, PMList *targets)
 					}
 					/* reload package cache */
 					pm_packages = db_loadpkgs(db, pm_packages);
+				}
 			} else {
 				/* no previous package version is installed, so this is actually just an
 				 * install
@@ -1280,7 +1282,7 @@ int pacman_add(pacdb_t *db, PMList *targets)
 				if(is_in(pathname, pmo_noupgrade)) {
 					notouch = 1;
 				} else {
-					if(!pmo_upgrade) {
+					if(!pmo_upgrade || oldpkg == NULL) {
 						nb = is_in(pathname, info->backup);
 					} else {
 						/* op == PM_UPGRADE */
@@ -1465,7 +1467,7 @@ int pacman_add(pacdb_t *db, PMList *targets)
 			}
 			vprint("done.\n");
 			if(pmo_usesyslog) {
-				if(pmo_upgrade) {
+				if(pmo_upgrade && oldpkg) {
 					syslog(LOG_INFO, "upgraded %s (%s -> %s)\n", info->name,
 						oldpkg->version, info->version);
 				} else {
@@ -1509,7 +1511,7 @@ int pacman_add(pacdb_t *db, PMList *targets)
 				snprintf(pm_install, PATH_MAX, "%s/%s/%s-%s/install", pmo_dbpath, db->treename, info->name, info->version);
 				vprint("Executing post-install script...\n");
 				snprintf(cmdline, PATH_MAX, "chroot %s /bin/sh %s post_%s %s %s", pmo_root, pm_install,
-					(pmo_upgrade ? "upgrade" : "install"), info->version, (pmo_upgrade ? oldpkg->version : ""));
+					(pmo_upgrade ? "upgrade" : "install"), info->version, ((pmo_upgrade && oldpkg) ? oldpkg->version : ""));
 				system(cmdline);
 			}
 		}

src/pacman.h

@@ -22,7 +22,7 @@
 #define _PAC_PACMAN_H
 
 #ifndef PACVER
-#define PACVER    "2.6.3"
+#define PACVER    "2.6.4"
 #endif
 
 #ifndef PKGDIR