[32546] trunk/base/src/macports1.0/macports.tcl

[jmpp at macports.org]

Revision: 32546
          http://trac.macosforge.org/projects/macports/changeset/32546
Author:   jmpp at macports.org
Date:     2008-01-07 13:14:11 -0800 (Mon, 07 Jan 2008)

Log Message:
-----------

If selfupdate is forced, the setting of the `$macports_version_new` var is skipped, so the `if {[rpm-vercomp $macports_version_new $macports::autoconf::macports_version] > 0 || $use_the_force_luke == "yes"}`
test fails because the `$macports_version_new` variable is not defined. Swap the two tests in the if clause so that we can short circuit around the second one and thus not fail if forcing is requested.

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

Modified: trunk/base/src/macports1.0/macports.tcl
===================================================================
--- trunk/base/src/macports1.0/macports.tcl	2008-01-07 20:44:22 UTC (rev 32545)
+++ trunk/base/src/macports1.0/macports.tcl	2008-01-07 21:14:11 UTC (rev 32546)
@@ -1669,7 +1669,7 @@
     }
 
     # check if we we need to rebuild base
-    if {[rpm-vercomp $macports_version_new $macports::autoconf::macports_version] > 0 || $use_the_force_luke == "yes"} {
+    if {$use_the_force_luke == "yes" || [rpm-vercomp $macports_version_new $macports::autoconf::macports_version] > 0} {
         # get installation user/group and permissions
         set owner [file attributes ${prefix} -owner]
         set group [file attributes ${prefix} -group]

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