[112421] branches/release_2_2

[jmr at macports.org]

Revision: 112421
          https://trac.macports.org/changeset/112421
Author:   jmr at macports.org
Date:     2013-10-22 06:37:57 -0700 (Tue, 22 Oct 2013)
Log Message:
-----------
merge r112067 from trunk:
 in mportdepends, skip mport refs that have been closed by a recursive call (#40721)

Revision Links:
--------------
    https://trac.macports.org/changeset/112067

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

Property Changed:
----------------
    branches/release_2_2/
    branches/release_2_2/base/


Property changes on: branches/release_2_2
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk:107106,107465,107527,107674,107753,108406,109869,110985,111254,111377,111641
   + /trunk:107106,107465,107527,107674,107753,108406,109869,110985,111254,111377,111641,112067


Property changes on: branches/release_2_2/base
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/gsoc08-privileges/base:37343-46937
/branches/gsoc09-logging/base:51231-60371
/branches/gsoc11-rev-upgrade/base:78828-88375
/branches/universal-sanity/base:51872-52323
/branches/variant-descs-14482/base:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659
/trunk/base:106802,106807,106809-106810,107106,107465,107527,107674,107753,108406,109869,110985,111254,111377,111641
/users/perry/base-bugs_and_notes:45682-46060
/users/perry/base-select:44044-44692
   + /branches/gsoc08-privileges/base:37343-46937
/branches/gsoc09-logging/base:51231-60371
/branches/gsoc11-rev-upgrade/base:78828-88375
/branches/universal-sanity/base:51872-52323
/branches/variant-descs-14482/base:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659
/trunk/base:106802,106807,106809-106810,107106,107465,107527,107674,107753,108406,109869,110985,111254,111377,111641,112067
/users/perry/base-bugs_and_notes:45682-46060
/users/perry/base-select:44044-44692

Modified: branches/release_2_2/base/src/macports1.0/macports.tcl
===================================================================
--- branches/release_2_2/base/src/macports1.0/macports.tcl	2013-10-22 13:32:52 UTC (rev 112420)
+++ branches/release_2_2/base/src/macports1.0/macports.tcl	2013-10-22 13:37:57 UTC (rev 112421)
@@ -3043,11 +3043,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/20131022/3d74ceba/attachment-0001.html>