Ticket #55637: patch-allow-reactivation.diff

src/registry2.0/portimage.tcl

@@ -93 +93 @@
         set registry_open yes
     }
     set todeactivate [list]
+    set actaction "Activating"
 
     registry::read {
 
@@ -121 +122 @@
             return -code error "Image error: Can't find image file $location"
         }
         if {[$requested state] eq "installed"} {
-            return -code error "Image error: ${name} @${specifier} is already active."
+            if {$force} {
+                set actaction "Reactivating"
+                lappend todeactivate $requested
+            } else {
+                return -code error "Image error: ${name} @${specifier} is already active."
+            }
         }
     }
     foreach a $todeactivate {
@@ -130 +136 @@
         }
     }
 
-    ui_msg "$UI_PREFIX [format [msgcat::mc "Activating %s @%s"] $name $specifier]"
+    ui_msg "$UI_PREFIX [format [msgcat::mc "$actaction %s @%s"] $name $specifier]"
 
     _activate_contents $requested
 }

src/port/port.tcl

@@ -2485 +2506 @@
     }
     foreachport $portlist {
         set composite_version [composite_version $portversion [array get variations]]
+        array set actoptions [array get options]
+        set force [expr [info exists actoptions(ports_force)] && [string is true -strict $actoptions(ports_force)]]
         if {![info exists options(ports_activate_no-exec)]
             && ![catch {set ilist [registry::installed $portname $composite_version]}]
-            && [llength $ilist] == 1} {
+            && ([llength $ilist] == 1 && !$force)} {
 
             set i [lindex $ilist 0]
             set regref [registry::entry open $portname [lindex $i 1] [lindex $i 2] [lindex $i 3] [lindex $i 5]]