[68749] trunk/base

[jmr at macports.org]

Revision: 68749
          http://trac.macports.org/changeset/68749
Author:   jmr at macports.org
Date:     2010-06-12 04:46:10 -0700 (Sat, 12 Jun 2010)
Log Message:
-----------
switch remaining instances of running install target to activate

Modified Paths:
--------------
    trunk/base/portmgr/packaging/dpkgall.tcl
    trunk/base/portmgr/packaging/rpmall.tcl
    trunk/base/src/macports1.0/macports.tcl

Modified: trunk/base/portmgr/packaging/dpkgall.tcl
===================================================================
--- trunk/base/portmgr/packaging/dpkgall.tcl	2010-06-12 11:42:02 UTC (rev 68748)
+++ trunk/base/portmgr/packaging/dpkgall.tcl	2010-06-12 11:46:10 UTC (rev 68749)
@@ -690,7 +690,7 @@
 	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 @@
 		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

Modified: trunk/base/portmgr/packaging/rpmall.tcl
===================================================================
--- trunk/base/portmgr/packaging/rpmall.tcl	2010-06-12 11:42:02 UTC (rev 68748)
+++ trunk/base/portmgr/packaging/rpmall.tcl	2010-06-12 11:46:10 UTC (rev 68749)
@@ -457,7 +457,7 @@
 				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"

Modified: trunk/base/src/macports1.0/macports.tcl
===================================================================
--- trunk/base/src/macports1.0/macports.tcl	2010-06-12 11:42:02 UTC (rev 68748)
+++ trunk/base/src/macports1.0/macports.tcl	2010-06-12 11:46:10 UTC (rev 68749)
@@ -1615,7 +1615,7 @@
         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 != {}} {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100612/6225613f/attachment-0001.html>