Revision: 81686 http://trac.macports.org/changeset/81686 Author: cal@macports.org Date: 2011-08-04 05:43:24 -0700 (Thu, 04 Aug 2011) Log Message: ----------- rev-upgrade: Move setting port_nodeps outside macports::upgrade 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-04 11:43:02 UTC (rev 81685) +++ branches/gsoc11-rev-upgrade/base/src/macports1.0/macports.tcl 2011-08-04 12:43:24 UTC (rev 81686) @@ -3449,11 +3449,6 @@ 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" @@ -3462,11 +3457,6 @@ 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? @@ -3973,10 +3963,13 @@ } 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 } # call macports::upgrade with ports_revupgrade option to rebuild the port