Revision: 116502 https://trac.macports.org/changeset/116502 Author: jmr@macports.org Date: 2014-01-27 02:53:44 -0800 (Mon, 27 Jan 2014) Log Message: ----------- portutil.tcl: fix Tcl 8.4 incompatibilities introduced in r116449 Revision Links: -------------- https://trac.macports.org/changeset/116449 Modified Paths: -------------- trunk/base/src/port1.0/portutil.tcl Modified: trunk/base/src/port1.0/portutil.tcl =================================================================== --- trunk/base/src/port1.0/portutil.tcl 2014-01-27 10:41:20 UTC (rev 116501) +++ trunk/base/src/port1.0/portutil.tcl 2014-01-27 10:53:44 UTC (rev 116502) @@ -581,7 +581,7 @@ return -code error "Malformed variant specification" } set code [lindex $args end] - set args [lrange $args 0 $len-2] + set args [lrange $args 0 [expr {$len - 2}]] set ditem [variant_new "temp-variant"] @@ -781,7 +781,7 @@ } set code [lindex $args end] set os [lindex $args 0] - set args [lrange $args 1 $len-2] + set args [lrange $args 1 [expr {$len - 2}]] foreach arg $args { if {[regexp {(^[0-9]+$)} $arg match result]} { @@ -1230,7 +1230,7 @@ set files $args set target ./ } else { - set files [lrange $args 0 [llength $args]-2] + set files [lrange $args 0 [expr {[llength $args] - 2}]] set target [lindex $args end] } @@ -2862,7 +2862,7 @@ } } else { # not root, so can't set owner/group - set permissions [lindex $attributes [lsearch $attributes "-permissions"]+1] + set permissions [lindex $attributes [expr {[lsearch $attributes "-permissions"] + 1}]] file attributes $file -permissions $permissions } } @@ -2956,7 +2956,7 @@ set i [string first . $depline] if {$i < 0} {set i [string length $depline]} - set depname [string range $depline 0 $i-1] + set depname [string range $depline 0 [expr {$i - 1}]] set depversion [string range $depline $i end] regsub {\.} $depversion {\.} depversion if {${os.platform} == "darwin"} {
participants (1)
-
jmr@macports.org