[37217] trunk/base/src/port1.0

[jmr at macports.org]

Revision: 37217
          http://trac.macosforge.org/projects/macports/changeset/37217
Author:   jmr at macports.org
Date:     2008-05-30 05:12:21 -0700 (Fri, 30 May 2008)

Log Message:
-----------
Add our new distfile mirror (distfiles.macports.org) and automatically append it to master_sites.

Modified Paths:
--------------
    trunk/base/src/port1.0/portfetch.tcl
    trunk/base/src/port1.0/resources/fetch/mirror_sites.tcl

Modified: trunk/base/src/port1.0/portfetch.tcl
===================================================================
--- trunk/base/src/port1.0/portfetch.tcl	2008-05-30 10:49:55 UTC (rev 37216)
+++ trunk/base/src/port1.0/portfetch.tcl	2008-05-30 12:12:21 UTC (rev 37217)
@@ -94,6 +94,7 @@
 default fetch.remote_time "no"
 
 default fallback_mirror_site "macports"
+default global_mirror_site "macports_distfiles"
 default mirror_sites.listfile {"mirror_sites.tcl"}
 default mirror_sites.listpath {"${portresourcepath}/fetch/"}
 
@@ -218,13 +219,15 @@
 # sites
 proc checksites {args} {
     global patch_sites master_sites master_sites.mirror_subdir \
-        patch_sites.mirror_subdir fallback_mirror_site env
+        patch_sites.mirror_subdir fallback_mirror_site global_mirror_site env
     
-    append master_sites " ${fallback_mirror_site}"
+    append master_sites " ${global_mirror_site} ${fallback_mirror_site}"
     if {[info exists env(MASTER_SITE_LOCAL)]} {
 	set master_sites [concat $env(MASTER_SITE_LOCAL) $master_sites]
     }
     
+    # we probably want to mirror downloaded patches
+    # on distfiles.macports.org too, but we don't currently
     append patch_sites " ${fallback_mirror_site}"
     if {[info exists env(PATCH_SITE_LOCAL)]} {
 	set patch_sites [concat $env(PATCH_SITE_LOCAL) $patch_sites]

Modified: trunk/base/src/port1.0/resources/fetch/mirror_sites.tcl
===================================================================
--- trunk/base/src/port1.0/resources/fetch/mirror_sites.tcl	2008-05-30 10:49:55 UTC (rev 37216)
+++ trunk/base/src/port1.0/resources/fetch/mirror_sites.tcl	2008-05-30 12:12:21 UTC (rev 37217)
@@ -180,6 +180,10 @@
     http://svn.macports.org/repository/macports/downloads/
 }
 
+set portfetch::mirror_sites::sites(macports_distfiles) {
+    http://distfiles.macports.org/:mirror
+}
+
 set portfetch::mirror_sites::sites(openbsd) {
     http://mirror.roothell.org/pub/OpenBSD/
     http://www.mirrorservice.org/sites/ftp.openbsd.org/pub/OpenBSD/

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20080530/031ffc3d/attachment.htm