[121130] branches/gsoc14-interactive/base/src/macports1.0/macports.tcl

[shasha at macports.org]

Revision: 121130
          https://trac.macports.org/changeset/121130
Author:   shasha at macports.org
Date:     2014-06-18 07:30:27 -0700 (Wed, 18 Jun 2014)
Log Message:
-----------
successfully asking before rebuilding in rev-upgrade

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-06-18 14:29:13 UTC (rev 121129)
+++ branches/gsoc14-interactive/base/src/macports1.0/macports.tcl	2014-06-18 14:30:27 UTC (rev 121130)
@@ -4614,15 +4614,6 @@
         }
         set broken_ports [lsort -unique $broken_ports]
 
-		##
-		# User Interaction Question
-		# Asking before rebuilding in rev-upgrade
-		ui_msg "You can always run 'port rev-upgrade' again to fix errors."
-		set retvalue [ui_ask_yesno "The following ports will be rebuilt:" "TestCase#1" $broken_ports {y} 0]
-		if {retvalue == 1} {
-			set $macports::revupgrade_mode dontrebuild
-		}
-		
         if {$macports::revupgrade_mode eq {rebuild}} {
             # don't try to rebuild ports that don't exist in the tree
             set temp_broken_ports {}
@@ -4748,11 +4739,25 @@
             }
         }
 
+        set broken_portnames {}
         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]"
         }
 
+        ##
+        # 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
+	        }
+        }
+
         # shared depscache for all ports that are going to be rebuilt
         array set depscache {}
         set status 0
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140618/3c710f15/attachment.html>