[pacman-dev] CVS update of pacman-lib/lib/libalpm (package.c)

[Aaron Griffin]

    Date: Wednesday, February 7, 2007 @ 01:12:54
  Author: aaron
    Path: /home/cvs-pacman/pacman-lib/lib/libalpm

Modified: package.c (1.62 -> 1.63)

Only honor 'force' if versions are NOT identical


-----------+
 package.c |   10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)


Index: pacman-lib/lib/libalpm/package.c
diff -u pacman-lib/lib/libalpm/package.c:1.62 pacman-lib/lib/libalpm/package.c:1.63
--- pacman-lib/lib/libalpm/package.c:1.62	Wed Feb  7 00:57:28 2007
+++ pacman-lib/lib/libalpm/package.c	Wed Feb  7 01:12:53 2007
@@ -134,15 +134,13 @@
 		_alpm_db_read(pkg->data, INFRQ_DESC, pkg);
 	}
 
-	if(pkg->force) {
-		/* skip the version compare call if this is a 'force' package */
-		return(1);
-	}
-
 	/* compare versions and see if we need to upgrade */
 	cmp = alpm_versioncmp(local_pkg->version, pkg->version);
 
-	if(cmp > 0) {
+	if(cmp != 0 && pkg->force) {
+		cmp = 1;
+		_alpm_log(PM_LOG_WARNING, _("%s: forcing upgrade to version %s"), local_pkg->name, pkg->version);
+	} else if(cmp > 0) {
 		/* local version is newer */
 		pmdb_t *db = pkg->data;
 		_alpm_log(PM_LOG_WARNING, _("%s: local (%s) is newer than %s (%s)"),