[91763] trunk/base/src/macports1.0/macports.tcl
jmr at macports.org
jmr at macports.org
Mon Apr 9 17:27:34 PDT 2012
Revision: 91763
https://trac.macports.org/changeset/91763
Author: jmr at macports.org
Date: 2012-04-09 17:27:33 -0700 (Mon, 09 Apr 2012)
Log Message:
-----------
factor out [$port name] calls
Modified Paths:
--------------
trunk/base/src/macports1.0/macports.tcl
Modified: trunk/base/src/macports1.0/macports.tcl
===================================================================
--- trunk/base/src/macports1.0/macports.tcl 2012-04-10 00:24:47 UTC (rev 91762)
+++ trunk/base/src/macports1.0/macports.tcl 2012-04-10 00:27:33 UTC (rev 91763)
@@ -4426,13 +4426,14 @@
set status 0
array set my_options [array get macports::global_options]
foreach port $topsort_ports {
- if {![info exists depscache(port:[$port name])]} {
+ set portname [$port name]
+ if {![info exists depscache(port:$portname)]} {
# set rev-upgrade options and nodeps if this is not the first run
set my_options(ports_revupgrade) "yes"
unset -nocomplain my_options(ports_nodeps)
unset -nocomplain my_options(ports_revupgrade_second_run)
unset -nocomplain my_options(ports_source_only)
- if {$broken_port_counts([$port name]) > 1} {
+ if {$broken_port_counts($portname) > 1} {
set my_options(ports_revupgrade_second_run) yes
set my_options(ports_nodeps) yes
# build from source only until the buildbot has some method of rev-upgrade, too
@@ -4440,11 +4441,11 @@
}
# call macports::upgrade with ports_revupgrade option to rebuild the port
- set status [macports::upgrade [$port name] "port:[$port name]" \
+ set status [macports::upgrade $portname "port:$portname" \
{} [array get my_options] depscache]
- ui_debug "Rebuilding port [$port name] finished with status $status"
+ ui_debug "Rebuilding port $portname finished with status $status"
if {$status != 0} {
- error "Error rebuilding [$port name]"
+ error "Error rebuilding $portname"
}
}
}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120409/248d39fb/attachment.html>
More information about the macports-changes
mailing list