Changeset 37442 for trunk/base/src

Timestamp:

06/07/08 16:28:20 (6 months ago)

Author:

jmr@…

Message:

Make uninstalling the old version of a port during upgrade work without -f,
whether due to -u, epoch override, or being in direct mode.

Files:

• trunk/base/src/macports1.0/macports.tcl (modified) (2 diffs)

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

@@ -2144 +2144 @@
 
     # uninstall old ports
-    if {[info exists options(port_uninstall_old)] || $epoch_override == 1 || [info exists options(ports_force)] || 0 != [string compare "image" ${macports::registry.installtype}] } {
+    if { $epoch_override == 1 || [info exists options(ports_force)] || 0 != [string compare "image" ${macports::registry.installtype}] } {
         # uninstall old
+        ui_debug "Uninstalling $iname ${version_installed}_$revision_installed$oldvariant"
+        # we have to force the uninstall in case of dependents
+        set force_cur [info exists options(ports_force)]
+        set options(ports_force) yes
+        if {[catch {portuninstall::uninstall $iname ${version_installed}_$revision_installed$oldvariant [array get options]} result]} {
+            global errorInfo
+            ui_debug "$errorInfo"
+            ui_error "Uninstall $iname ${version_installed}_$revision_installed$oldvariant failed: $result"
+            return 1
+        }
+        if {!$force_cur} {
+            unset options(ports_force)
+        }
+    } else {
+        # XXX deactivate version_installed
+        if {[catch {portimage::deactivate $iname ${version_installed}_$revision_installed$oldvariant $optionslist} result]} {
+            global errorInfo
+            ui_debug "$errorInfo"
+            ui_error "Deactivating $iname ${version_installed}_$revision_installed failed: $result"
+            return 1
+        }
+        if { [info exists options(port_uninstall_old)] } {
+            # uninstalling now could fail due to dependents when not forced,
+            # because the new version is not installed
+            set uninstall_later yes
+        }
+    }
+
+    if {[catch {set result [mportexec $workername install]} result]} {
+        global errorInfo
+        ui_debug "$errorInfo"
+        ui_error "Couldn't activate $portname ${version_in_tree}_$revision_in_tree$oldvariant: $result"
+        return 1
+    }
+    
+    if { [info exists uninstall_later] && $uninstall_later == yes } {
         ui_debug "Uninstalling $iname ${version_installed}_$revision_installed$oldvariant"
         if {[catch {portuninstall::uninstall $iname ${version_installed}_$revision_installed$oldvariant $optionslist} result]} {
@@ -2153 +2189 @@
             return 1
         }
-    } else {
-        # XXX deactivate version_installed
-        if {[catch {portimage::deactivate $iname ${version_installed}_$revision_installed$oldvariant $optionslist} result]} {
-            global errorInfo
-            ui_debug "$errorInfo"
-            ui_error "Deactivating $iname ${version_installed}_$revision_installed failed: $result"
-            return 1
-        }
-    }
-
-    if {[catch {set result [mportexec $workername install]} result]} {
-        global errorInfo
-        ui_debug "$errorInfo"
-        ui_error "Couldn't activate $portname ${version_in_tree}_$revision_in_tree$oldvariant: $result"
-        return 1
     }