Changeset 36762

Timestamp:

05/14/08 01:48:55 (7 months ago)

Author:

jmr@…

Message:

upgrade: if the latest installed version of a port is not active, deactivate
the currently active version, if any, before trying to activate the latest
version. Fix for #12013.

Files:

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

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

@@ -1938 +1938 @@
         }
     }
-    set anyactive 0
+    set anyactive no
     set version_installed {}
     set revision_installed {}
@@ -1965 +1965 @@
                 set version_installed $version
                 set revision_installed $revision
+                set variant_installed $variant
                 set epoch_installed [registry::property_retrieve [registry::open_entry $portname [lindex $i 1] [lindex $i 2] $variant] epoch]
                 set num $i
@@ -1971 +1972 @@
             set isactive [lindex $i 4]
             if {$isactive == 1} {
-                if { [rpm-vercomp $version_installed $version] < 0
-                        || ([rpm-vercomp $version_installed $version] == 0
-                            && [rpm-vercomp $revision_installed $revision] < 0)} {
-                    # deactivate version
-                    if {[catch {portimage::deactivate $portname $version $optionslist} result]} {
-                        global errorInfo
-                        ui_debug "$errorInfo"
-                        ui_error "Deactivating $portname @${version_installed}_${revision_installed} failed: $result"
-                        return 1
-                    }
-                }
+                set anyactive yes
+                set version_active $version
+                set revision_active $revision
+                set variant_active $variant
+            }
+        }
+        if { $anyactive && ([rpm-vercomp $version_installed $version_active] != 0
+                            || [rpm-vercomp $revision_installed $revision_active] != 0
+                            || [string compare $variant_installed $variant_active] != 0)} {
+            # deactivate version
+            if {[catch {portimage::deactivate $portname ${version_active}_${revision_active}${variant_active} $optionslist} result]} {
+                global errorInfo
+                ui_debug "$errorInfo"
+                ui_error "Deactivating $portname @${version_active}_${revision_active} failed: $result"
+                return 1
             }
         }