[112461] branches/release_2_2/base/src/macports1.0/macports.tcl

[cal at macports.org]

Revision: 112461
          https://trac.macports.org/changeset/112461
Author:   cal at macports.org
Date:     2013-10-23 14:27:22 -0700 (Wed, 23 Oct 2013)
Log Message:
-----------
release_2_2: revert r112424 fixing #40150 due to a number of issues with the change to be fixed on trunk

Revision Links:
--------------
    https://trac.macports.org/changeset/112424

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

Modified: branches/release_2_2/base/src/macports1.0/macports.tcl
===================================================================
--- branches/release_2_2/base/src/macports1.0/macports.tcl	2013-10-23 21:19:20 UTC (rev 112460)
+++ branches/release_2_2/base/src/macports1.0/macports.tcl	2013-10-23 21:27:22 UTC (rev 112461)
@@ -3465,16 +3465,10 @@
     set is_revupgrade no
     if {[info exists options(ports_revupgrade)] && $options(ports_revupgrade)} {
         set is_revupgrade yes
-        # unset revupgrade options so we can upgrade dependencies with the same
-        # $options without also triggering a rebuild there, see #40150
-        unset options(ports_revupgrade)
     }
     set is_revupgrade_second_run no
     if {[info exists options(ports_revupgrade_second_run)] && $options(ports_revupgrade_second_run)} {
         set is_revupgrade_second_run yes
-        # unset revupgrade options so we can upgrade dependencies with the same
-        # $options without also triggering a rebuild there, see #40150
-        unset options(ports_revupgrade_second_run)
     }
 
     # check if the port is in tree
@@ -3738,7 +3732,7 @@
         } elseif {$is_revupgrade} {
             ui_debug "rev-upgrade override ... upgrading!"
             # in the first run of rev-upgrade, only activate possibly already existing files and check for missing dependencies
-            # do nothing, just prevent will_install being set to no below
+            set will_install yes
         } else {
             if {[info exists portinfo(canonical_active_variants)] && $portinfo(canonical_active_variants) != $oldvariant} {
                 if {[llength $variationslist] > 0} {
@@ -3764,9 +3758,9 @@
     }
 
     # first upgrade dependencies
-    if {![info exists options(ports_nodeps)]} {
+    if {![info exists options(ports_nodeps)] && !$is_revupgrade} {
         # the last arg is because we might have to build from source if a rebuild is being forced
-        set status [_upgrade_dependencies portinfo depscache variationslist options [expr $will_build && $already_installed && !$is_revupgrade]]
+        set status [_upgrade_dependencies portinfo depscache variationslist options [expr $will_build && $already_installed]]
         if {$status != 0 && $status != 2 && ![ui_isset ports_processall]} {
             catch {mportclose $mport}
             return $status
@@ -4550,9 +4544,11 @@
             if {![info exists depscache(port:$portname)]} {
                 # set rev-upgrade options and nodeps if this is not the first run
                 set my_options(ports_revupgrade) "yes"
+                unset -nocomplain my_options(ports_nodeps)
                 unset -nocomplain my_options(ports_revupgrade_second_run)
                 if {$broken_port_counts($portname) > 1} {
                     set my_options(ports_revupgrade_second_run) yes
+                    set my_options(ports_nodeps) yes
                     # build from source only until the buildbot has some method of rev-upgrade, too
                     set my_options(ports_source_only) yes
                 }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20131023/6ec1ddf1/attachment.html>