Skip to content
Permalink
Browse files

switch remaining instances of running install target to activate

git-svn-id: https://svn.macports.org/repository/macports/trunk/base@68749 d073be05-634f-4543-b044-5fe20cf6d1d6
  • Loading branch information
jmroot committed Jun 12, 2010
1 parent b8cfc89 commit fb098f13c2c2568ba9fbfa25b69df0b3c4911f04
Showing with 4 additions and 4 deletions.
  1. +2 −2 portmgr/packaging/dpkgall.tcl
  2. +1 −1 portmgr/packaging/rpmall.tcl
  3. +1 −1 src/macports1.0/macports.tcl
@@ -690,7 +690,7 @@ proc initialize_system {args} {
set variations ""
foreach port [get_required_ports] {
if {[catch {do_portexec $port [array get options] [array get variants] install} result]} {
if {[catch {do_portexec $port [array get options] [array get variants] activate} result]} {
global errorInfo
ui_debug "$errorInfo"
ui_noisy_error "Fatal error: $result"
@@ -745,7 +745,7 @@ proc do_portexec {port options variants target} {
exit 1
}
if {[catch {set result [mportexec $workername install]} result] || $result == 1} {
if {[catch {set result [mportexec $workername $target]} result] || $result == 1} {
# Close the port
mportclose $workername
@@ -457,7 +457,7 @@ foreach {name array} $allpackages {
ui_error "Internal error: unable to install ${prebuild}... exiting"
exit 1
}
if {[catch {set result [mportexec $workername install]} result] ||
if {[catch {set result [mportexec $workername activate]} result] ||
$result == 1} {
global errorInfo
ui_debug "$errorInfo"
@@ -1615,7 +1615,7 @@ proc mportexec {mport target} {
if { [string equal ${macports::registry.installtype} "image"] } {
set result [dlist_eval $dlist _mportactive [list _mportexec "activate"]]
} else {
set result [dlist_eval $dlist _mportinstalled [list _mportexec "install"]]
set result [dlist_eval $dlist _mportinstalled [list _mportexec "activate"]]
}

if {$result != {}} {

0 comments on commit fb098f1

Please sign in to comment.
You can’t perform that action at this time.