[92546] trunk/base/src/port/port.tcl

[jmr at macports.org]

Revision: 92546
          https://trac.macports.org/changeset/92546
Author:   jmr at macports.org
Date:     2012-04-30 21:34:13 -0700 (Mon, 30 Apr 2012)
Log Message:
-----------
handle subports correctly in action_deps and action_log when the porturl is known

Modified Paths:
--------------
    trunk/base/src/port/port.tcl

Modified: trunk/base/src/port/port.tcl
===================================================================
--- trunk/base/src/port/port.tcl	2012-05-01 04:33:14 UTC (rev 92545)
+++ trunk/base/src/port/port.tcl	2012-05-01 04:34:13 UTC (rev 92546)
@@ -1840,7 +1840,13 @@
                 break_softcontinue "Portdir $portdir not found" 1 status
             }
             array unset portinfo
-            array set portinfo [lindex $result 1]
+            set matchindex [lsearch -exact -nocase $result $portname]
+            if {$matchindex != -1} {
+                array set portinfo [lindex $result [incr matchindex]]
+            } else {
+                ui_warn "Portdir $portdir doesn't seem to belong to portname $portname"
+                array set portinfo [lindex $result 1]
+            }
             set portname $portinfo(name)
         }
         set portpath [macports::getportdir $porturl]
@@ -2783,7 +2789,13 @@
             if {[llength $result] < 2} {
                 break_softcontinue "Portdir $portdir not found" 1 status
             }
-            array set portinfo [lindex $result 1]
+            set matchindex [lsearch -exact -nocase $result $portname]
+            if {$matchindex != -1} {
+                array set portinfo [lindex $result [incr matchindex]]
+            } else {
+                ui_warn "Portdir $portdir doesn't seem to belong to portname $portname"
+                array set portinfo [lindex $result 1]
+            }
         }
 
         if {!([info exists options(ports_${action}_index)] && $options(ports_${action}_index) eq "yes")} {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120430/bc2ea7a5/attachment.html>