[81670] branches/gsoc11-rev-upgrade/base/src/macports1.0/macports.tcl

[cal at macports.org]

Revision: 81670
          http://trac.macports.org/changeset/81670
Author:   cal at macports.org
Date:     2011-08-03 14:27:12 -0700 (Wed, 03 Aug 2011)
Log Message:
-----------
rev-upgrade: Do not rebuild with dependencies

Modified Paths:
--------------
    branches/gsoc11-rev-upgrade/base/src/macports1.0/macports.tcl

Modified: branches/gsoc11-rev-upgrade/base/src/macports1.0/macports.tcl
===================================================================
--- branches/gsoc11-rev-upgrade/base/src/macports1.0/macports.tcl	2011-08-03 20:49:50 UTC (rev 81669)
+++ branches/gsoc11-rev-upgrade/base/src/macports1.0/macports.tcl	2011-08-03 21:27:12 UTC (rev 81670)
@@ -3449,6 +3449,11 @@
 
     if {$will_build} {
         # install version_in_tree (but don't activate yet)
+        if {$is_revupgrade_second_run} {
+            # disable following dependencies if in rebuild step of rev-upgrade
+            set oldnodeps [macports::global_option_isset port_nodeps]
+            set macports::global_options(port_nodeps) yes
+        }
         if {[catch {set result [mportexec $workername install]} result] || $result != 0} {
             if {[info exists ::errorInfo]} {
                 ui_debug "$::errorInfo"
@@ -3457,6 +3462,11 @@
             catch {mportclose $workername}
             return 1
         }
+        if {$is_revupgrade_second_run} {
+            if {!$oldnodeps} {
+                unset -nocomplain macports::global_options(port_nodeps)
+            }
+        }
     }
 
     # are we installing an existing version due to force or epoch override?
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110803/184a1a54/attachment.html>