Changeset 81686

Timestamp:

08/04/11 05:43:24 (4 years ago)

Author:

cal@…

Message:

rev-upgrade: Move setting port_nodeps outside macports::upgrade

File:

• branches/gsoc11-rev-upgrade/base/src/macports1.0/macports.tcl (modified) (3 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]} {
@@ -3462 +3457 @@
             catch {mportclose $workername}
             return 1
-        }
-        if {$is_revupgrade_second_run} {
-            if {!$oldnodeps} {
-                unset -nocomplain macports::global_options(port_nodeps)
-            }
         }
     }
@@ -3974 +3964 @@
                 array set variations $variants
 
+                # set rev-upgrade options and nodeps if this is not the first run
                 set macports::global_options(ports_revupgrade) "yes"
+                unset -nocomplain macports::global_options(ports_nodeps)
                 unset -nocomplain macports::global_options(ports_revupgrade_second_run)
                 if {$broken_port_counts([$port name]) > 1} {
                     set macports::global_options(ports_revupgrade_second_run) yes
+                    set macports::global_options(ports_nodeps) yes
                 }