Index: openacs-4/packages/acs-admin/www/install/install.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/install/install.tcl,v
diff -u -r1.14 -r1.15
--- openacs-4/packages/acs-admin/www/install/install.tcl	3 Sep 2024 15:37:29 -0000	1.14
+++ openacs-4/packages/acs-admin/www/install/install.tcl	28 Dec 2024 16:58:25 -0000	1.15
@@ -10,13 +10,19 @@
     {head_channel:token ""}
 }
 
-
+set channels [apm_get_repository_channels]
 if {$current_channel eq ""} {
     set current_channel [apm_get_repository_channel]
-    set channel $current_channel
+    if {[lsearch -index 0 $channels $current_channel] == -1} {
+        #
+        # The reported channel is not included in the list of
+        # channels, so it must be HEAD.
+        #
+        set current_channel HEAD
+    }
 }
 if {$head_channel eq ""} {
-    set head_channel [lindex [apm_get_repository_channels] 0 0]
+    set head_channel [lindex $channels 0 0]
 }
 
 #
@@ -74,6 +80,8 @@
     set fetch_url $base_url/$channel/
 }
 
+ns_log notice "Fetch from repository URL: $fetch_url"
+
 apm_get_package_repository -repository_url $fetch_url -array repository
 
 if {$channel ne $current_channel} {
Index: openacs-4/packages/acs-tcl/tcl/apm-install-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/apm-install-procs.tcl,v
diff -u -r1.132 -r1.133
--- openacs-4/packages/acs-tcl/tcl/apm-install-procs.tcl	9 Oct 2024 14:42:06 -0000	1.132
+++ openacs-4/packages/acs-tcl/tcl/apm-install-procs.tcl	28 Dec 2024 16:58:25 -0000	1.133
@@ -2221,9 +2221,20 @@
     $doc documentElement root
     foreach node [$root selectNodes {//ul/li/a}] {
         set href [$node getAttribute href]
-        if {[regexp {^(\d+[-]\d+)} $href . version]} {
+        if {[regexp {^(\d+[-]\d+[-]?\d*)} $href . version]} {
             set name $version
-            set tag oacs-$version
+            #
+            # Try to get the tag from the span node right after the "a" element.
+            #
+            set spanNode [lindex [[$node parentNode] selectNodes {span}] 0]
+            if {$spanNode ne ""} {
+                set tag [$spanNode text]
+            } else {
+                #
+                # Fall back to old version
+                #
+                set tag oacs-$version
+            }
             lappend repositories [list $name $tag]
         } else {
             #set txt [string trim [$node asText]]