Changeset 81670

Timestamp:

08/03/11 14:27:12 (4 years ago)

Author:

cal@…

Message:

rev-upgrade: Do not rebuild with dependencies

File:

• branches/gsoc11-rev-upgrade/base/src/macports1.0/macports.tcl (modified) (2 diffs)

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

@@ -3450 +3450 @@
     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]} {
@@ -3457 +3462 @@
             catch {mportclose $workername}
             return 1
+        }
+        if {$is_revupgrade_second_run} {
+            if {!$oldnodeps} {
+                unset -nocomplain macports::global_options(port_nodeps)
+            }
         }
     }