[85057] branches/gsoc11-rev-upgrade/base/src/macports1.0/macports.tcl
cal at macports.org
cal at macports.org
Sat Oct 8 08:49:24 PDT 2011
Revision: 85057
http://trac.macports.org/changeset/85057
Author: cal at macports.org
Date: 2011-10-08 08:49:23 -0700 (Sat, 08 Oct 2011)
Log Message:
-----------
rev-upgrade: Replace hardcoded use of "---> " with new variable $macports::ui_prefix
Modified Paths:
--------------
branches/gsoc11-rev-upgrade/base/src/macports1.0/macports.tcl
Modified: branches/gsoc11-rev-upgrade/base/src/macports1.0/macports.tcl
===================================================================
--- branches/gsoc11-rev-upgrade/base/src/macports1.0/macports.tcl 2011-10-08 15:42:07 UTC (rev 85056)
+++ branches/gsoc11-rev-upgrade/base/src/macports1.0/macports.tcl 2011-10-08 15:49:23 UTC (rev 85057)
@@ -70,6 +70,8 @@
variable ui_priorities "error warn msg notice info debug any"
variable port_phases "any fetch checksum"
variable current_phase "main"
+
+ variable ui_prefix "---> "
}
# Provided UI instantiations
@@ -1692,7 +1694,7 @@
}
}
- ui_msg -nonewline "---> Computing dependencies for [_mportkey $mport subport]"
+ ui_msg -nonewline "$macports::ui_prefix Computing dependencies for [_mportkey $mport subport]"
if {[macports::ui_isset ports_debug]} {
# play nice with debug messages
ui_msg ""
@@ -1712,7 +1714,7 @@
# print the dep list
if {[llength $dlist] > 0} {
- set depstring "---> Dependencies to be installed:"
+ set depstring "$macports::ui_prefix Dependencies to be installed:"
foreach ditem $dlist {
append depstring " [ditem_key $ditem provides]"
}
@@ -2962,7 +2964,7 @@
ui_debug "MacPorts sources location: $mp_source_path"
# sync the MacPorts sources
- ui_msg "---> Updating MacPorts base sources using rsync"
+ ui_msg "$macports::ui_prefix Updating MacPorts base sources using rsync"
if { [catch { system "$rsync_path $rsync_options rsync://${rsync_server}/${rsync_dir} $mp_source_path" } result ] } {
return -code error "Error synchronizing MacPorts sources: $result"
}
@@ -3035,7 +3037,7 @@
# syncing ports tree.
if {![info exists options(ports_selfupdate_nosync)] || $options(ports_selfupdate_nosync) != "yes"} {
- ui_msg "---> Updating the ports tree"
+ ui_msg "$macports::ui_prefix Updating the ports tree"
if {$comp > 0} {
# updated portfiles potentially need new base to parse - tell sync to try to
# use prefabricated PortIndex files and signal if it couldn't
@@ -3048,9 +3050,9 @@
if {$use_the_force_luke == "yes" || $comp > 0} {
if {[info exists options(ports_dryrun)] && $options(ports_dryrun) == "yes"} {
- ui_msg "---> MacPorts base is outdated, selfupdate would install $macports_version_new (dry run)"
+ ui_msg "$macports::ui_prefix MacPorts base is outdated, selfupdate would install $macports_version_new (dry run)"
} else {
- ui_msg "---> MacPorts base is outdated, installing new version $macports_version_new"
+ ui_msg "$macports::ui_prefix MacPorts base is outdated, installing new version $macports_version_new"
# get installation user/group and permissions
set owner [file attributes ${prefix} -owner]
@@ -3100,9 +3102,9 @@
}
}
} elseif {$comp < 0} {
- ui_msg "---> MacPorts base is probably trunk or a release candidate"
+ ui_msg "$macports::ui_prefix MacPorts base is probably trunk or a release candidate"
} else {
- ui_msg "---> MacPorts base is already the latest version"
+ ui_msg "$macports::ui_prefix MacPorts base is already the latest version"
}
# set the MacPorts sources to the right owner
@@ -3373,7 +3375,7 @@
# at this point we need to check if a different port will be replacing this one
if {[info exists portinfo(replaced_by)] && ![info exists options(ports_upgrade_no-replace)]} {
- ui_msg "---> $portname is replaced by $portinfo(replaced_by)"
+ ui_msg "$macports::ui_prefix $portname is replaced by $portinfo(replaced_by)"
if {[catch {mportlookup $portinfo(replaced_by)} result]} {
global errorInfo
ui_debug "$errorInfo"
@@ -3839,7 +3841,7 @@
if {[llength $files] > 0} {
registry::write {
try {
- ui_msg "---> Updating database of binaries"
+ ui_msg "$macports::ui_prefix Updating database of binaries"
set i 1
foreach f $files {
ui_debug "Updating binary flag for file $i of [llength $files]: [$f path]"
@@ -3855,7 +3857,7 @@
set broken_files {};
set binaries [registry::file search active 1 binary 1]
- ui_msg "---> Scanning binaries for linking errors"
+ ui_msg "$macports::ui_prefix Scanning binaries for linking errors"
if {[llength $binaries] > 0} {
set handle [machista::create_handle]
if {$handle == "NULL"} {
@@ -3953,10 +3955,10 @@
machista::destroy_handle $handle
if {[llength $broken_files] == 0} {
- ui_msg "---> No broken files found. :)"
+ ui_msg "$macports::ui_prefix No broken files found. :)"
return 0;
}
- ui_msg "---> Found [llength $broken_files] broken file(s), matching files to ports"
+ ui_msg "$macports::ui_prefix Found [llength $broken_files] broken file(s), matching files to ports"
set broken_ports {}
set broken_files [lsort -unique $broken_files]
foreach file $broken_files {
@@ -3979,7 +3981,7 @@
}
}
- ui_msg "---> Found [llength $broken_ports] broken port(s), determining rebuild order"
+ ui_msg "$macports::ui_prefix Found [llength $broken_ports] broken port(s), determining rebuild order"
# broken_ports are the nodes in our graph
# now we need adjacents
foreach port $broken_ports {
@@ -4021,7 +4023,7 @@
}
}
- ui_msg "---> Rebuilding in order"
+ ui_msg "$macports::ui_prefix Rebuilding in order"
foreach port $topsort_ports {
ui_msg " [$port name] @[$port version] [$port variants][$port negated_variants]"
}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20111008/470cfc63/attachment.html>
More information about the macports-changes
mailing list