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

[jmr at macports.org]

Revision: 46224
          http://trac.macports.org/changeset/46224
Author:   jmr at macports.org
Date:     2009-01-31 18:34:55 -0800 (Sat, 31 Jan 2009)
Log Message:
-----------
Fix mportdepends breakage introduced in r46058.

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

Modified: trunk/base/src/macports1.0/macports.tcl
===================================================================
--- trunk/base/src/macports1.0/macports.tcl	2009-02-01 01:52:21 UTC (rev 46223)
+++ trunk/base/src/macports1.0/macports.tcl	2009-02-01 02:34:55 UTC (rev 46224)
@@ -1750,10 +1750,6 @@
     foreach depspec $depends {
         # grab the portname portion of the depspec
         set dep_portname [lindex [split $depspec :] end]
-        # Skip the port if it's already in the accumulated list.
-        if {$skipSatisfied && [info exists accDeps($dep_portname)]} {
-            continue
-        }
         
         # Find the porturl
         if {[catch {set res [mportsearch $dep_portname false exact]} error]} {
@@ -1790,11 +1786,14 @@
             ditem_append_unique $mport requires "[ditem_key $subport provides]"
     
             if {$recurseDeps} {
-                # Add it to the list
-                set accDeps($dep_portname) 1
+                # Skip the port if it's already in the accumulated list.
+                if {![info exists accDeps($dep_portname)]} {
+                    # Add it to the list
+                    set accDeps($dep_portname) 1
 
-                # We'll recursively iterate on it.
-                lappend subPorts $subport
+                    # We'll recursively iterate on it.
+                    lappend subPorts $subport
+                }
             }
         }
     }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090131/fec29e9c/attachment.html>