Revision: 92547 https://trac.macports.org/changeset/92547 Author: jmr@macports.org Date: 2012-04-30 21:36:58 -0700 (Mon, 30 Apr 2012) Log Message: ----------- merge r92546 from trunk: handle subports correctly in action_deps and action_log when the porturl is known Revision Links: -------------- https://trac.macports.org/changeset/92546 Modified Paths: -------------- branches/release_2_1/base/src/port/port.tcl Property Changed: ---------------- branches/release_2_1/ branches/release_2_1/base/ Property changes on: branches/release_2_1 ___________________________________________________________________ Modified: svn:mergeinfo - /trunk:91825,91829,91834,92072,92342,92404 + /trunk:91825,91829,91834,92072,92342,92404,92546 Property changes on: branches/release_2_1/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:91825,91829,91834,92072,92342,92404 /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:91825,91829,91834,92072,92342,92404,92546 /users/perry/base-bugs_and_notes:45682-46060 /users/perry/base-select:44044-44692 Modified: branches/release_2_1/base/src/port/port.tcl =================================================================== --- branches/release_2_1/base/src/port/port.tcl 2012-05-01 04:34:13 UTC (rev 92546) +++ branches/release_2_1/base/src/port/port.tcl 2012-05-01 04:36:58 UTC (rev 92547) @@ -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")} {