[68967] branches/release_1_9/base/src

[jmr at macports.org]

Revision: 68967
          http://trac.macports.org/changeset/68967
Author:   jmr at macports.org
Date:     2010-06-18 14:58:05 -0700 (Fri, 18 Jun 2010)
Log Message:
-----------
merge r68965 from trunk:
 fix handling of distfiles with tags that have no corresponding URL (#25332)

Revision Links:
--------------
    http://trac.macports.org/changeset/68965

Modified Paths:
--------------
    branches/release_1_9/base/src/package1.0/portarchivefetch.tcl
    branches/release_1_9/base/src/port1.0/fetch_common.tcl
    branches/release_1_9/base/src/port1.0/portdistfiles.tcl
    branches/release_1_9/base/src/port1.0/portfetch.tcl

Modified: branches/release_1_9/base/src/package1.0/portarchivefetch.tcl
===================================================================
--- branches/release_1_9/base/src/package1.0/portarchivefetch.tcl	2010-06-18 21:54:36 UTC (rev 68966)
+++ branches/release_1_9/base/src/package1.0/portarchivefetch.tcl	2010-06-18 21:58:05 UTC (rev 68967)
@@ -174,7 +174,7 @@
             }
             if {![info exists urlmap($url_var)]} {
                 ui_error [format [msgcat::mc "No defined site for tag: %s, using archive_sites"] $url_var]
-                set urlmap($url_var) $archive_sites
+                set urlmap($url_var) $urlmap(archive_sites)
             }
             unset -nocomplain fetched
             foreach site $urlmap($url_var) {

Modified: branches/release_1_9/base/src/port1.0/fetch_common.tcl
===================================================================
--- branches/release_1_9/base/src/port1.0/fetch_common.tcl	2010-06-18 21:54:36 UTC (rev 68966)
+++ branches/release_1_9/base/src/port1.0/fetch_common.tcl	2010-06-18 21:58:05 UTC (rev 68967)
@@ -218,7 +218,7 @@
         if {![info exists urlmap($url_var)]} {
             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]
+                set urlmap($url_var) $urlmap($default_listvar)
             } else {
                 set urlmap($url_var) {}
             }
@@ -294,7 +294,7 @@
     foreach {url_var distfile} $fetch_urls {
         if {![info exists urlmap($url_var)]} {
             ui_error [format [msgcat::mc "No defined site for tag: %s, using master_sites"] $url_var]
-            set urlmap($url_var) $master_sites
+            set urlmap($url_var) $urlmap(master_sites)
         }
         foreach site $urlmap($url_var) {
             lappend urls $site

Modified: branches/release_1_9/base/src/port1.0/portdistfiles.tcl
===================================================================
--- branches/release_1_9/base/src/port1.0/portdistfiles.tcl	2010-06-18 21:54:36 UTC (rev 68966)
+++ branches/release_1_9/base/src/port1.0/portdistfiles.tcl	2010-06-18 21:58:05 UTC (rev 68967)
@@ -82,7 +82,7 @@
 
         # determine sites to download from
         if {![info exists urlmap($url_var)]} {
-            set urlmap($url_var) $master_sites
+            set urlmap($url_var) $urlmap(master_sites)
         }
         
         # determine URLs to download

Modified: branches/release_1_9/base/src/port1.0/portfetch.tcl
===================================================================
--- branches/release_1_9/base/src/port1.0/portfetch.tcl	2010-06-18 21:54:36 UTC (rev 68966)
+++ branches/release_1_9/base/src/port1.0/portfetch.tcl	2010-06-18 21:58:05 UTC (rev 68967)
@@ -471,7 +471,7 @@
             }
             if {![info exists urlmap($url_var)]} {
                 ui_error [format [msgcat::mc "No defined site for tag: %s, using master_sites"] $url_var]
-                set urlmap($url_var) $master_sites
+                set urlmap($url_var) $urlmap(master_sites)
             }
             unset -nocomplain fetched
             foreach site $urlmap($url_var) {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100618/9d55c68b/attachment.html>