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

[jmr at macports.org]

Revision: 91806
          https://trac.macports.org/changeset/91806
Author:   jmr at macports.org
Date:     2012-04-10 21:13:36 -0700 (Tue, 10 Apr 2012)
Log Message:
-----------
check local upgrade options for revupgrade settings, not global options

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

Modified: trunk/base/src/macports1.0/macports.tcl
===================================================================
--- trunk/base/src/macports1.0/macports.tcl	2012-04-11 01:30:26 UTC (rev 91805)
+++ trunk/base/src/macports1.0/macports.tcl	2012-04-11 04:13:36 UTC (rev 91806)
@@ -3417,11 +3417,11 @@
 
     # Is this a rev-upgrade-called run?
     set is_revupgrade no
-    if {[macports::global_option_isset ports_revupgrade]} {
+    if {[info exists options(ports_revupgrade)] && $options(ports_revupgrade)} {
         set is_revupgrade yes
     }
     set is_revupgrade_second_run no
-    if {[macports::global_option_isset ports_revupgrade_second_run]} {
+    if {[info exists options(ports_revupgrade_second_run)] && $options(ports_revupgrade_second_run)} {
         set is_revupgrade_second_run yes
     }
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120410/d89a4ec2/attachment.html>