[68752] branches/release_1_9/base

[jmr at macports.org]

Revision: 68752
          http://trac.macports.org/changeset/68752
Author:   jmr at macports.org
Date:     2010-06-12 06:57:23 -0700 (Sat, 12 Jun 2010)
Log Message:
-----------
merge r68746, r68749 from trunk:
 run activate target instead of install (#25218)

Revision Links:
--------------
    http://trac.macports.org/changeset/68746
    http://trac.macports.org/changeset/68749

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

Modified: branches/release_1_9/base/portmgr/packaging/dpkgall.tcl
===================================================================
--- branches/release_1_9/base/portmgr/packaging/dpkgall.tcl	2010-06-12 13:18:35 UTC (rev 68751)
+++ branches/release_1_9/base/portmgr/packaging/dpkgall.tcl	2010-06-12 13:57:23 UTC (rev 68752)
@@ -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: branches/release_1_9/base/portmgr/packaging/rpmall.tcl
===================================================================
--- branches/release_1_9/base/portmgr/packaging/rpmall.tcl	2010-06-12 13:18:35 UTC (rev 68751)
+++ branches/release_1_9/base/portmgr/packaging/rpmall.tcl	2010-06-12 13:57:23 UTC (rev 68752)
@@ -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: branches/release_1_9/base/src/macports1.0/macports.tcl
===================================================================
--- branches/release_1_9/base/src/macports1.0/macports.tcl	2010-06-12 13:18:35 UTC (rev 68751)
+++ branches/release_1_9/base/src/macports1.0/macports.tcl	2010-06-12 13:57:23 UTC (rev 68752)
@@ -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 != {}} {
@@ -2851,7 +2851,7 @@
                     return $status
                 }
                 # now install it
-                if {[catch {set result [mportexec $workername install]} result]} {
+                if {[catch {set result [mportexec $workername activate]} result]} {
                     global errorInfo
                     ui_debug "$errorInfo"
                     ui_error "Unable to exec port: $result"
@@ -3191,7 +3191,7 @@
             ui_msg "Skipping deactivate $portname @${version_active}_${revision_active}${variant_active} (dry run)"
         }
         ui_msg "Skipping activate $newname @${version_in_tree}_${revision_in_tree}$portinfo(canonical_active_variants) (dry run)"
-    } elseif {[catch {set result [mportexec $workername install]} result]} {
+    } elseif {[catch {set result [mportexec $workername activate]} result]} {
         global errorInfo
         ui_debug "$errorInfo"
         ui_error "Couldn't activate $newname ${version_in_tree}_${revision_in_tree}$portinfo(canonical_active_variants): $result"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100612/f4c291dc/attachment.html>