[41142] branches/variant-descs-14482/base/src/port1.0/portfetch.tcl

[raimue at macports.org]

Revision: 41142
          http://trac.macports.org/changeset/41142
Author:   raimue at macports.org
Date:     2008-10-25 14:11:30 -0700 (Sat, 25 Oct 2008)
Log Message:
-----------
port1.0/portfetch.tcl:
Use getportresourcepath

Modified Paths:
--------------
    branches/variant-descs-14482/base/src/port1.0/portfetch.tcl

Modified: branches/variant-descs-14482/base/src/port1.0/portfetch.tcl
===================================================================
--- branches/variant-descs-14482/base/src/port1.0/portfetch.tcl	2008-10-25 20:07:49 UTC (rev 41141)
+++ branches/variant-descs-14482/base/src/port1.0/portfetch.tcl	2008-10-25 21:11:30 UTC (rev 41142)
@@ -100,7 +100,7 @@
 default fallback_mirror_site "macports"
 default global_mirror_site "macports_distfiles"
 default mirror_sites.listfile {"mirror_sites.tcl"}
-default mirror_sites.listpath {"${portresourcepath}/fetch/"}
+default mirror_sites.listpath {"port1.0/fetch"}
 
 # Option-executed procedures
 option_proc use_bzip2 fix_extract_suffix
@@ -173,8 +173,10 @@
 # For a given mirror site type, e.g. "gnu" or "x11", check to see if there's a
 # pre-registered set of sites, and if so, return them.
 proc mirror_sites {mirrors tag subdir} {
-    global UI_PREFIX portname portresourcepath mirror_sites.listfile mirror_sites.listpath dist_subdir
-    source ${mirror_sites.listpath}${mirror_sites.listfile}
+    global UI_PREFIX portname porturl mirror_sites.listfile mirror_sites.listpath dist_subdir
+
+    source [getportresourcepath $porturl [file join ${mirror_sites.listpath} ${mirror_sites.listfile}]]
+
     if {![info exists portfetch::mirror_sites::sites($mirrors)]} {
         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/20081025/ff8bf876/attachment.html>