[66589] trunk/base/src
jmr at macports.org
jmr at macports.org
Sat Apr 17 07:42:12 PDT 2010
Revision: 66589
http://trac.macports.org/changeset/66589
Author: jmr at macports.org
Date: 2010-04-17 07:42:06 -0700 (Sat, 17 Apr 2010)
Log Message:
-----------
enable processing of empty mirror lists so that the *_SITE_LOCAL env vars will still be appended
Modified Paths:
--------------
trunk/base/src/package1.0/portarchivefetch.tcl
trunk/base/src/port1.0/fetch_common.tcl
Modified: trunk/base/src/package1.0/portarchivefetch.tcl
===================================================================
--- trunk/base/src/package1.0/portarchivefetch.tcl 2010-04-17 14:08:41 UTC (rev 66588)
+++ trunk/base/src/package1.0/portarchivefetch.tcl 2010-04-17 14:42:06 UTC (rev 66589)
@@ -57,8 +57,7 @@
# Ignore SSL certificate
default archivefetch.ignore_sslcert no
-# TODO: enable this when binaries are available on a macports server
-#default archive_sites macports_archives
+default archive_sites macports_archives
default archive_sites.listfile {"archive_sites.tcl"}
default archive_sites.listpath {"port1.0/fetch"}
Modified: trunk/base/src/port1.0/fetch_common.tcl
===================================================================
--- trunk/base/src/port1.0/fetch_common.tcl 2010-04-17 14:08:41 UTC (rev 66588)
+++ trunk/base/src/port1.0/fetch_common.tcl 2010-04-17 14:42:06 UTC (rev 66589)
@@ -190,8 +190,12 @@
foreach {url_var distfile} $fetch_urls {
if {![info exists urlmap($url_var)]} {
- ui_error [format [msgcat::mc "No defined site for tag: %s, using $default_listvar"] $url_var]
- set urlmap($url_var) [set $default_listvar]
+ if {$url_var != $default_listvar} {
+ ui_error [format [msgcat::mc "No defined site for tag: %s, using $default_listvar"] $url_var]
+ set urlmap($url_var) [set $default_listvar]
+ } else {
+ set urlmap($url_var) {}
+ }
}
set urllist $urlmap($url_var)
set hosts {}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100417/791684c3/attachment.html>
More information about the macports-changes
mailing list