[122308] branches/gsoc14-interactive/base/src/macports1.0/macports.tcl
shasha at macports.org
shasha at macports.org
Sun Jul 20 06:33:23 PDT 2014
Revision: 122308
https://trac.macports.org/changeset/122308
Author: shasha at macports.org
Date: 2014-07-20 06:33:23 -0700 (Sun, 20 Jul 2014)
Log Message:
-----------
fixed rev-upgrade interaction
Modified Paths:
--------------
branches/gsoc14-interactive/base/src/macports1.0/macports.tcl
Modified: branches/gsoc14-interactive/base/src/macports1.0/macports.tcl
===================================================================
--- branches/gsoc14-interactive/base/src/macports1.0/macports.tcl 2014-07-20 13:32:25 UTC (rev 122307)
+++ branches/gsoc14-interactive/base/src/macports1.0/macports.tcl 2014-07-20 13:33:23 UTC (rev 122308)
@@ -4754,22 +4754,27 @@
}
set broken_portnames {}
- ui_msg "$macports::ui_prefix Rebuilding in order"
+ if {![info exists macports::ui_options(questions_yesno)]} {
+ ui_msg "$macports::ui_prefix Rebuilding in order"
+ }
foreach port $topsort_ports {
lappend broken_portnames [$port name]@[$port version][$port variants]
- ui_msg " [$port name] @[$port version] [$port variants][$port negated_variants]"
+ if {![info exists macports::ui_options(questions_yesno)]} {
+ ui_msg " [$port name] @[$port version] [$port variants][$port negated_variants]"
+ }
}
##
# User Interaction Question
# Asking before rebuilding in rev-upgrade
if {[info exists macports::ui_options(questions_yesno)]} {
- ui_msg "You can always run 'port rev-upgrade' again to fix errors."
- set retvalue [$macports::ui_options(questions_yesno) "The following ports will be rebuilt:" "TestCase#1" $broken_portnames {y} 0]
- if {$retvalue == 1} {
- # quit as user answered 'no'
- return 0
- }
+ ui_msg "You can always run 'port rev-upgrade' again to fix errors."
+ set retvalue [$macports::ui_options(questions_yesno) "The following ports will be rebuilt:" "TestCase#1" $broken_portnames {y} 0]
+ if {$retvalue == 1} {
+ # quit as user answered 'no'
+ return 0
+ }
+ unset macports::ui_options(questions_yesno)
}
# shared depscache for all ports that are going to be rebuilt
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140720/af675bb0/attachment.html>
More information about the macports-changes
mailing list