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

[cal at macports.org]

Revision: 112464
          https://trac.macports.org/changeset/112464
Author:   cal at macports.org
Date:     2013-10-23 15:03:18 -0700 (Wed, 23 Oct 2013)
Log Message:
-----------
rev-upgrade: Avoid building build dependencies from source when not needed in the second run of rev-upgrade

Modified Paths:
--------------
    trunk/base/src/macports1.0/macports.tcl

Modified: trunk/base/src/macports1.0/macports.tcl
===================================================================
--- trunk/base/src/macports1.0/macports.tcl	2013-10-23 21:31:01 UTC (rev 112463)
+++ trunk/base/src/macports1.0/macports.tcl	2013-10-23 22:03:18 UTC (rev 112464)
@@ -3821,6 +3821,11 @@
     array set interp_options [array get options]
     set interp_options(ports_requested) $requestedflag
     set interp_options(subport) $newname
+    # Mark this port to be rebuilt from source if this isn't the first time it
+    # was flagged as broken by rev-uprgade
+    if {$is_revupgrade_second_run} {
+        set interp_options(ports_source_only) yes
+    }
 
     if {[catch {set mport [mportopen $porturl [array get interp_options] [array get variations]]} result]} {
         global errorInfo
@@ -4683,12 +4688,9 @@
             set portname [$port name]
             if {![info exists depscache(port:$portname)]} {
                 unset -nocomplain my_options(ports_revupgrade_second_run) \
-                                  my_options(ports_source_only) \
                                   my_options(ports_nodeps)
                 if {$broken_port_counts($portname) > 1} {
                     set my_options(ports_revupgrade_second_run) yes
-                    # build from source only until the buildbot has some method of rev-upgrade, too
-                    set my_options(ports_source_only) yes
 
                     if {$broken_port_counts($portname) > 2} {
                         # runtime deps are upgraded the first time, build deps 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20131023/7b545086/attachment.html>