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

[jmr at macports.org]

Revision: 112067
          https://trac.macports.org/changeset/112067
Author:   jmr at macports.org
Date:     2013-10-10 20:14:13 -0700 (Thu, 10 Oct 2013)
Log Message:
-----------
in mportdepends, skip mport refs that have been closed by a recursive call (#40721)

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

Modified: trunk/base/src/macports1.0/macports.tcl
===================================================================
--- trunk/base/src/macports1.0/macports.tcl	2013-10-11 02:55:52 UTC (rev 112066)
+++ trunk/base/src/macports1.0/macports.tcl	2013-10-11 03:14:13 UTC (rev 112067)
@@ -3166,11 +3166,15 @@
 
     # Loop on the depports.
     if {$recurseDeps} {
+        # Dep ports should be installed (all dependencies must be satisfied).
         foreach depport $depPorts {
-            # Sub ports should be installed (all dependencies must be satisfied).
-            set res [mportdepends $depport {} $recurseDeps $skipSatisfied 1]
-            if {$res != 0} {
-                return $res
+            # Any of these may have been closed by a previous recursive call
+            # and replaced by a universal version. This is fine, just skip.
+            if {[ditem_key $depport] ne {}} {
+                set res [mportdepends $depport {} $recurseDeps $skipSatisfied 1]
+                if {$res != 0} {
+                    return $res
+                }
             }
         }
     }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20131010/e6b30ebb/attachment.html>