Changeset 3884 for trunk/base

Timestamp:

Nov 3, 2003, 5:36:42 PM (20 years ago)

Author:

fkr

Message:

Bug:
Submitted by:
Reviewed by:
Approved by:
Obtained from:

fallback to the opendarwin mirror list. The opendarwin mirror list
(currently these are 'distfiles.opendarwin.org', 'distfiles-od.opendarwin.org'
and 'distfiles-msn.opendarwin.org') is appended to the master_sites listing
given in the Portfile. The OpenDarwin site is tried at last before failing.

Location:

trunk/base/src/port1.0

Files:

• portfetch.tcl (modified) (4 diffs)
• resources/fetch/mirror_sites.tcl (modified) (2 diffs)

trunk/base/src/port1.0/portfetch.tcl

@@ -63 +63 @@
 default fetch.post_args {[portfetch::assemble_url ${site} ${distfile}]}
 
+default fallback_mirror_site "opendarwin"
 default mirror_sites.listfile {"mirror_sites.tcl"}
 default mirror_sites.listpath {"${portresourcepath}/fetch/"}
@@ -155 +156 @@
         return {}
     }
-    
+
     set ret [list]
     foreach element $portfetch::mirror_sites::sites($mirrors) {
-        if {"$subdir" == ""} {
+        
+        # here we have the chance to take a look at tags, that possibly
+        # have been assigned in mirror_sites.tcl
+        set splitlist [split $element :]
+        if {[llength $splitlist] > 1} {
+                set element "[lindex $splitlist 0]:[lindex $splitlist 1]" 
+                set mirror_tag "[lindex $splitlist 2]"
+        }
+
+        if {$subdir == "" && $mirror_tag != "nosubdir"} {
             set subdir ${portname}
         }
 
-        if {"$tag" != ""} {
+        if {"$tag" != ""} {
             eval append element "${subdir}:${tag}"
         } else {
@@ -169 +179 @@
         eval lappend ret $element
     }
+
     return $ret
 }
@@ -180 +191 @@
     global distdir distfiles patchfiles all_dist_files patch_sites fetch_urls \
         master_sites filespath master_sites.mirror_subdir \
-        patch_sites.mirror_subdir
+        patch_sites.mirror_subdir fallback_mirror_site
+
+    append master_sites " ${fallback_mirror_site}"
 
     foreach list {master_sites patch_sites} {

trunk/base/src/port1.0/resources/fetch/mirror_sites.tcl

@@ -1 @@
-# $Id: mirror_sites.tcl,v 1.3 2003/09/12 23:48:35 fkr Exp $
+# $Id: mirror_sites.tcl,v 1.4 2003/11/03 17:36:42 fkr Exp $
 # mirror_sites.tcl
 #
 # List of master site classes for use in Portfiles
 # Most of these are taken shamelessly from FreeBSD.
+#
+# Appending :nosubdir as a tag to a mirror, means that
+# the portfetch target will NOT append a subdirectory to
+# the mirror site.
 #
 # Please keep this list sorted.
@@ -102 +106 @@
 }
 
+set portfetch::mirror_sites::sites(opendarwin) {
+        http://distfiles.opendarwin.org/
+        http://distfiles-od.opendarwin.org/:nosubdir
+        http://distfiles-msn.opendarwin.org/:nosubdir
+}
+
 set portfetch::mirror_sites::sites(perl_cpan) {
     http://www.cpan.dk/CPAN/modules/by-module/