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

[jmr at macports.org]

Revision: 73544
          http://trac.macports.org/changeset/73544
Author:   jmr at macports.org
Date:     2010-11-16 23:14:34 -0800 (Tue, 16 Nov 2010)
Log Message:
-----------
still need to record dependency relationships for non-installed deps that have already been seen, so ports are installed in the right order

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

Modified: trunk/base/src/macports1.0/macports.tcl
===================================================================
--- trunk/base/src/macports1.0/macports.tcl	2010-11-17 06:27:19 UTC (rev 73543)
+++ trunk/base/src/macports1.0/macports.tcl	2010-11-17 07:14:34 UTC (rev 73544)
@@ -2492,9 +2492,11 @@
             # skip depspec/archs combos we've already seen
             set seenkey "${depspec},[join $required_archs ,]"
             if {[info exists depspec_seen($seenkey)]} {
+                if {$depspec_seen($seenkey) != 0} {
+                    # nonzero means the dep is not satisfied, so we have to record it
+                    ditem_append_unique $mport requires $depspec_seen($seenkey)
+                }
                 continue
-            } else {
-                set depspec_seen($seenkey) 1
             }
             
             # Is that dependency satisfied or this port installed?
@@ -2582,7 +2584,11 @@
                 }
     
                 # Append the sub-port's provides to the port's requirements list.
-                ditem_append_unique $mport requires "[ditem_key $subport provides]"
+                set subport_provides "[ditem_key $subport provides]"
+                ditem_append_unique $mport requires $subport_provides
+                set depspec_seen($seenkey) $subport_provides
+            } else {
+                set depspec_seen($seenkey) 0
             }
         }
     }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20101116/afdc7ad2/attachment-0001.html>