[68746] trunk/base/src/macports1.0/macports.tcl

[jmr at macports.org]

Revision: 68746
          http://trac.macports.org/changeset/68746
Author:   jmr at macports.org
Date:     2010-06-12 04:37:44 -0700 (Sat, 12 Jun 2010)
Log Message:
-----------
explicitly run activate target in upgrade (#25218)

Modified Paths:
--------------
    trunk/base/src/macports1.0/macports.tcl

Modified: trunk/base/src/macports1.0/macports.tcl
===================================================================
--- trunk/base/src/macports1.0/macports.tcl	2010-06-12 08:57:04 UTC (rev 68745)
+++ trunk/base/src/macports1.0/macports.tcl	2010-06-12 11:37:44 UTC (rev 68746)
@@ -2861,7 +2861,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"
@@ -3201,7 +3201,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/716ad2e4/attachment.html>