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

[jmr at macports.org]

Revision: 82924
          http://trac.macports.org/changeset/82924
Author:   jmr at macports.org
Date:     2011-08-21 19:14:01 -0700 (Sun, 21 Aug 2011)
Log Message:
-----------
in mportdepends, don't add an mport with fewer archs than one with the same name already seen

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

Modified: trunk/base/src/macports1.0/macports.tcl
===================================================================
--- trunk/base/src/macports1.0/macports.tcl	2011-08-22 02:01:16 UTC (rev 82923)
+++ trunk/base/src/macports1.0/macports.tcl	2011-08-22 02:14:01 UTC (rev 82924)
@@ -2630,9 +2630,24 @@
             continue
         }
         foreach depspec $portinfo($deptype) {
-            # skip depspec/archs combos we've already seen
+            # skip depspec/archs combos we've already seen, and ones with less archs than ones we've seen
             set seenkey "${depspec},[join $required_archs ,]"
+            set seen 0
             if {[info exists depspec_seen($seenkey)]} {
+                set seen 1
+            } else {
+                set prev_seenkeys [array names depspec_seen ${depspec},*]
+                set nrequired [llength $required_archs]
+                foreach key $prev_seenkeys {
+                    set key_archs [lrange [split $key ,] 1 end]
+                    if {[llength $key_archs] > $nrequired} {
+                        set seen 1
+                        set seenkey $key
+                        break
+                    }
+                }
+            }
+            if {$seen} {
                 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)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110821/bfd6c214/attachment.html>