Changeset 68749 for trunk/base

Timestamp:

Jun 12, 2010, 11:46:10 AM (14 years ago)

Author:

jmr@…

Message:

switch remaining instances of running install target to activate

Location:

trunk/base

Files:

• portmgr/packaging/dpkgall.tcl (modified) (2 diffs)
• portmgr/packaging/rpmall.tcl (modified) (1 diff)
• src/macports1.0/macports.tcl (modified) (1 diff)

trunk/base/portmgr/packaging/dpkgall.tcl

@@ -691 +691 @@
 
         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"
@@ -746 +746 @@
         }
 
-        if {[catch {set result [mportexec $workername install]} result] || $result == 1} {
+        if {[catch {set result [mportexec $workername $target]} result] || $result == 1} {
 
                 # Close the port

trunk/base/portmgr/packaging/rpmall.tcl

@@ -458 +458 @@
                                 exit 1
                         }
-                        if {[catch {set result [mportexec $workername install]} result] ||
+                        if {[catch {set result [mportexec $workername activate]} result] ||
                                 $result == 1} {
                                 global errorInfo

trunk/base/src/macports1.0/macports.tcl

@@ -1616 +1616 @@
             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"]]
         }