[118717] trunk/base/src/package1.0/portarchivefetch.tcl

[cal at macports.org]

Revision: 118717
          https://trac.macports.org/changeset/118717
Author:   cal at macports.org
Date:     2014-04-08 17:44:31 -0700 (Tue, 08 Apr 2014)
Log Message:
-----------
base: print a detailed error message when fetching archives fails, don't print port name and what failed, because that's already being done further up

Modified Paths:
--------------
    trunk/base/src/package1.0/portarchivefetch.tcl

Modified: trunk/base/src/package1.0/portarchivefetch.tcl
===================================================================
--- trunk/base/src/package1.0/portarchivefetch.tcl	2014-04-09 00:43:49 UTC (rev 118716)
+++ trunk/base/src/package1.0/portarchivefetch.tcl	2014-04-09 00:44:31 UTC (rev 118717)
@@ -216,6 +216,7 @@
             }
             set failed_sites 0
             unset -nocomplain fetched
+            set lastError ""
             foreach site $urlmap($url_var) {
                 if {[string index $site end] ne "/"} {
                     append site "/[option archive.subdir]"
@@ -238,6 +239,7 @@
                     throw
                 } catch {{*} eCode eMessage} {
                     ui_debug [msgcat::mc "Fetching archive failed: %s" $eMessage]
+                    set lastError $eMessage
                     file delete -force "${incoming_path}/${archive}.TMP"
                     incr failed_sites
                     if {$failed_sites > 2 && ![tbool ports_binary_only] && ![_archive_available]} {
@@ -292,7 +294,11 @@
         return 0
     }
     if {[info exists ports_binary_only] && $ports_binary_only eq "yes"} {
-        return -code error "archivefetch failed for [option subport] @[option version]_[option revision][option portvariants]"
+        if {[info exists lastError] && $lastError ne ""} {
+            error [msgcat::mc "version @[option version]_[option revision][option portvariants]: %s" $lastError]
+        } else {
+            error "version @[option version]_[option revision][option portvariants]"
+        }
     } else {
         return 0
     }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140408/4a9408c8/attachment.html>