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

[cal at macports.org]

Revision: 118716
          https://trac.macports.org/changeset/118716
Author:   cal at macports.org
Date:     2014-04-08 17:43:49 -0700 (Tue, 08 Apr 2014)
Log Message:
-----------
base: pass up information on why fetching failed, don't print that fetching failed, because that's already being done further up the stack

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

Modified: trunk/base/src/port1.0/portfetch.tcl
===================================================================
--- trunk/base/src/port1.0/portfetch.tcl	2014-04-09 00:28:48 UTC (rev 118715)
+++ trunk/base/src/port1.0/portfetch.tcl	2014-04-09 00:43:49 UTC (rev 118716)
@@ -533,6 +533,7 @@
                 set urlmap($url_var) $urlmap(master_sites)
             }
             unset -nocomplain fetched
+            set lastError ""
             foreach site $urlmap($url_var) {
                 ui_notice "$UI_PREFIX [format [msgcat::mc "Attempting to fetch %s from %s"] $distfile $site]"
                 set file_url [portfetch::assemble_url $site $distfile]
@@ -551,10 +552,15 @@
                     throw
                 } catch {{*} eCode eMessage} {
                     ui_debug [msgcat::mc "Fetching distfile failed: %s" $eMessage]
+                    set lastError $eMessage
                 }
             }
             if {![info exists fetched]} {
-                return -code error [msgcat::mc "fetch failed"]
+                if {$lastError ne ""} {
+                    error $lastError
+                } else {
+                    error [msgcat::mc "fetch failed"]
+                }
             }
         }
     }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140408/7644987a/attachment-0001.html>