[54935] trunk/base/src/port/port.tcl

[jmr at macports.org]

Revision: 54935
          http://trac.macports.org/changeset/54935
Author:   jmr at macports.org
Date:     2009-08-04 14:35:31 -0700 (Tue, 04 Aug 2009)
Log Message:
-----------
avoid double upgrade recursion

Modified Paths:
--------------
    trunk/base/src/port/port.tcl

Modified: trunk/base/src/port/port.tcl
===================================================================
--- trunk/base/src/port/port.tcl	2009-08-04 20:53:29 UTC (rev 54934)
+++ trunk/base/src/port/port.tcl	2009-08-04 21:35:31 UTC (rev 54935)
@@ -2010,6 +2010,12 @@
     if {[require_portlist portlist]} {
         return 1
     }
+    # stop upgrade from being called via mportexec as well
+    set orig_nodeps yes
+    if {![info exists macports::global_options(ports_nodeps)]} {
+        set macports::global_options(ports_nodeps) yes
+        set orig_nodeps no
+    }
     # shared depscache for all ports in the list
     array set depscache {}
     set status 0
@@ -2028,11 +2034,17 @@
             
             set status [macports::upgrade $portname "port:$portname" $global_variations_list $variations_list [array get options] depscache]
             if {$status != 0 && ![macports::ui_isset ports_processall]} {
+                if {!$orig_nodeps} {
+                    unset macports::global_options(ports_nodeps)
+                }
                 return $status
             }
         }
     }
 
+    if {!$orig_nodeps} {
+        unset macports::global_options(ports_nodeps)
+    }
     return $status
 }
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090804/4b5fb02a/attachment-0001.html>