[47914] branches/release_1_7/base/src/macports1.0/macports.tcl

[jmr at macports.org]

Revision: 47914
          http://trac.macports.org/changeset/47914
Author:   jmr at macports.org
Date:     2009-03-09 15:59:42 -0700 (Mon, 09 Mar 2009)
Log Message:
-----------
release_1_7: fix some breakage introduced with r47773

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

Modified: branches/release_1_7/base/src/macports1.0/macports.tcl
===================================================================
--- branches/release_1_7/base/src/macports1.0/macports.tcl	2009-03-09 22:52:43 UTC (rev 47913)
+++ branches/release_1_7/base/src/macports1.0/macports.tcl	2009-03-09 22:59:42 UTC (rev 47914)
@@ -2029,7 +2029,7 @@
         # That was a very dirty hack showing how ugly our depencendy and upgrade code is.
         # To get it working when user provides -f, we also need to set the variant to
         # avoid a future failure.
-        set variant ""
+        set variant_installed ""
     } else {
         # find latest version installed and active version (if any)
         set num 0
@@ -2196,7 +2196,7 @@
         return 1
     }
 
-    if { 0 == [string compare "image" ${macports::registry.installtype}] } {
+    if { $anyactive && 0 == [string compare "image" ${macports::registry.installtype}] } {
         # deactivate version_active
         if {[catch {portimage::deactivate $active_name ${version_active}_${revision_active}${variant_active} $optionslist} result]} {
             global errorInfo
@@ -2237,11 +2237,11 @@
     }
     
     if { [info exists uninstall_later] && $uninstall_later == yes } {
-        ui_debug "Uninstalling $active_name ${version_active}_${revision_active}${variant_active}"
-        if {[catch {portuninstall::uninstall $active_name ${version_active}_${revision_active}${variant_active} $optionslist} result]} {
+        ui_debug "Uninstalling $iname ${version_installed}_${revision_installed}${variant_installed}"
+        if {[catch {portuninstall::uninstall $iname ${version_installed}_${revision_installed}${variant_installed} $optionslist} result]} {
             global errorInfo
             ui_debug "$errorInfo"
-            ui_error "Uninstall $active_name ${version_active}_${revision_active}${variant_active} failed: $result"
+            ui_error "Uninstall $iname ${version_installed}_${revision_installed}${variant_installed} failed: $result"
             return 1
         }
     }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090309/4b948f91/attachment-0001.html>