Ticket #32018: patch-port1.0-fetch_common.tcl.diff

fetch_common.tcl

@@ -105 +105 @@
         # have been assigned in mirror_sites.tcl
         set splitlist [split $element :]
         # every element is a URL, so we'll always have multiple elements. no need to check
-        set element "[lindex $splitlist 0]:[lindex $splitlist 1]"
-        set mirror_tag "[lindex $splitlist 2]"
+        # element can be:
+        # http://svn.macports.org/repository/macports/distfiles/
+        # http://distfiles.macports.org/:mirror
+        # http://localhost:6227/:nosubdir
+        # http://packages.macports.org/:nosubdir
+        set mirror_tag_index [expr [llength $splitlist] - 1]
+        if {$mirror_tag_index < 2} {
+                set mirror_tag_index 2
+        } else {
+        set element [join [lreplace $splitlist $mirror_tag_index end] ":"]
+        }
+        set mirror_tag "[lindex $splitlist $mirror_tag_index]"
 
         set name_re {\$(?:name\y|\{name\})}
         # if the URL has $name embedded, kill any mirror_tag that may have been added