[93153] trunk/base/src/macports1.0/macports.tcl

[jmr at macports.org]

Revision: 93153
          https://trac.macports.org/changeset/93153
Author:   jmr at macports.org
Date:     2012-05-16 03:01:30 -0700 (Wed, 16 May 2012)
Log Message:
-----------
don't override source-only option for first rev-upgrade rebuild, and give up after one reinstall if binary-only is set

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-05-16 07:46:21 UTC (rev 93152)
+++ trunk/base/src/macports1.0/macports.tcl	2012-05-16 10:01:30 UTC (rev 93153)
@@ -4370,6 +4370,8 @@
                     ui_error "Please run port -d -y rev-upgrade and use the output to report a bug."
                 }
                 error "Port $portname still broken after rebuilding [expr $broken_port_counts($portname) - 1] time(s)"
+            } elseif {$broken_port_counts($portname) > 1 && [global_option_isset ports_binary_only]} {
+                error "Port $portname still broken after reinstalling -- can't rebuild due to binary-only mode"
             }
         }
 
@@ -4468,7 +4470,6 @@
                 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($portname) > 1} {
                     set my_options(ports_revupgrade_second_run) yes
                     set my_options(ports_nodeps) yes
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120516/a7c74546/attachment.html>