[27900] trunk/base

[source_changes at macosforge.org]

Revision: 27900
          http://trac.macosforge.org/projects/macports/changeset/27900
Author:   eridius at macports.org
Date:     2007-08-15 13:44:04 -0700 (Wed, 15 Aug 2007)

Log Message:
-----------
Fix macports::upgrade to properly handle installed versions that begin with letters

Modified Paths:
--------------
    trunk/base/ChangeLog
    trunk/base/src/macports1.0/macports.tcl

Modified: trunk/base/ChangeLog
===================================================================
--- trunk/base/ChangeLog	2007-08-15 20:01:09 UTC (rev 27899)
+++ trunk/base/ChangeLog	2007-08-15 20:44:04 UTC (rev 27900)
@@ -6,6 +6,8 @@
 
 Unreleased:
 
+    - Fix upgrade to properly handle installed versions beginning with letters (eridius in r27900).
+
     - Chris Pickel's GSoC2007 work: registry2.0 & cregistry (mainly r27518 & r27520)
 
     - Eugene Pimenov's GSoC2007 work: Trace lib on unix sockets (r26682).

Modified: trunk/base/src/macports1.0/macports.tcl
===================================================================
--- trunk/base/src/macports1.0/macports.tcl	2007-08-15 20:01:09 UTC (rev 27899)
+++ trunk/base/src/macports1.0/macports.tcl	2007-08-15 20:44:04 UTC (rev 27900)
@@ -1751,8 +1751,8 @@
 		}
 	}
 	set anyactive 0
-	set version_installed 0
-	set revision_installed 0
+	set version_installed {}
+	set revision_installed {}
 	set epoch_installed 0
 	if {$ilist == ""} {
 		# XXX  this sets $version_installed to $version_in_tree even if not installed!!
@@ -1771,7 +1771,8 @@
 			set variant [lindex $i 3]
 			set version [lindex $i 1]
 			set revision [lindex $i 2]
-			if { [rpm-vercomp $version $version_installed] > 0
+			if { $version_installed == {} ||
+					[rpm-vercomp $version $version_installed] > 0
 					|| ([rpm-vercomp $version $version_installed] == 0
 						&& [rpm-vercomp $revision $revision_installed] > 0)} {
 				set version_installed $version

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20070815/5db78a47/attachment.html