[47326] trunk/base/src/port1.0/portfetch.tcl

[raimue at macports.org]

Revision: 47326
          http://trac.macports.org/changeset/47326
Author:   raimue at macports.org
Date:     2009-02-25 17:21:33 -0800 (Wed, 25 Feb 2009)
Log Message:
-----------
port1.0/portfetch.tcl:
 * Do not try to source mirror list file if it does not exist
 * Do not emit a warning if global distfile mirror site or fallback site are missing
These fixes are necessary to avoid problems with our test-suite, which does not
have a _resources directory.

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

Modified: trunk/base/src/port1.0/portfetch.tcl
===================================================================
--- trunk/base/src/port1.0/portfetch.tcl	2009-02-26 00:52:08 UTC (rev 47325)
+++ trunk/base/src/port1.0/portfetch.tcl	2009-02-26 01:21:33 UTC (rev 47326)
@@ -205,11 +205,17 @@
 # pre-registered set of sites, and if so, return them.
 proc mirror_sites {mirrors tag subdir} {
     global UI_PREFIX portname porturl mirror_sites.listfile mirror_sites.listpath dist_subdir
+    global global_mirror_site fallback_mirror_site
 
-    source [getportresourcepath $porturl [file join ${mirror_sites.listpath} ${mirror_sites.listfile}]]
+    set mirrorfile [getportresourcepath $porturl [file join ${mirror_sites.listpath} ${mirror_sites.listfile}]]
+    if {[file exists $mirrorfile]} {
+        source $mirrorfile
+    }
 
     if {![info exists portfetch::mirror_sites::sites($mirrors)]} {
-        ui_warn "[format [msgcat::mc "No mirror sites on file for class %s"] $mirrors]"
+        if {$mirrors != $global_mirror_site && $mirrors != $fallback_mirror_site} {
+            ui_warn "[format [msgcat::mc "No mirror sites on file for class %s"] $mirrors]"
+        }
         return {}
     }
     
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090225/7e0065ab/attachment-0001.html>