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

[jmr at macports.org]

Revision: 64968
          http://trac.macports.org/changeset/64968
Author:   jmr at macports.org
Date:     2010-03-18 10:17:21 -0700 (Thu, 18 Mar 2010)
Log Message:
-----------
ensure that os.platform and os.major are set in the registry before comparing them

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

Modified: trunk/base/src/macports1.0/macports.tcl
===================================================================
--- trunk/base/src/macports1.0/macports.tcl	2010-03-18 17:10:37 UTC (rev 64967)
+++ trunk/base/src/macports1.0/macports.tcl	2010-03-18 17:17:21 UTC (rev 64968)
@@ -2804,8 +2804,9 @@
         } elseif {[info exists options(ports_upgrade_enforce-variants)] && $options(ports_upgrade_enforce-variants) eq "yes"
                   && [info exists portinfo(canonical_active_variants)] && $portinfo(canonical_active_variants) != $oldvariant} {
             ui_debug "variant override ... upgrading!"
-        } elseif {[_mportkey $workername "{os.platform}"] != $os_platform_installed
-                  || [_mportkey $workername "{os.major}"] != $os_major_installed} {
+        } elseif {$os_platform_installed != "" && $os_major_installed != "" && $os_platform_installed != 0
+                  && ([_mportkey $workername "{os.platform}"] != $os_platform_installed
+                  || [_mportkey $workername "{os.major}"] != $os_major_installed)} {
             ui_debug "platform mismatch ... upgrading!"
             set build_override 1
         } else {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100318/3cfe3b1c/attachment.html>