[118715] trunk/base/src/macports1.0/macports.tcl

[cal at macports.org]

Revision: 118715
          https://trac.macports.org/changeset/118715
Author:   cal at macports.org
Date:     2014-04-08 17:28:48 -0700 (Tue, 08 Apr 2014)
Log Message:
-----------
base: Abort rather than syncing the next source if curl fetch is interrupted by a signal, loosly related to #43280

Modified Paths:
--------------
    trunk/base/src/macports1.0/macports.tcl

Modified: trunk/base/src/macports1.0/macports.tcl
===================================================================
--- trunk/base/src/macports1.0/macports.tcl	2014-04-09 00:28:08 UTC (rev 118714)
+++ trunk/base/src/macports1.0/macports.tcl	2014-04-09 00:28:48 UTC (rev 118715)
@@ -2525,8 +2525,14 @@
                     set progressflag "--progress ${macports::ui_options(progress_download)}"
                 }
 
-                if {[catch {eval curl fetch $progressflag {$source} {$tarpath}} error]} {
-                    ui_error "Fetching $source failed ($error)"
+                try {
+                    eval curl fetch $progressflag {$source} {$tarpath}
+                } catch {{POSIX SIG SIGINT} eCode eMessage} {
+                    throw
+                } catch {{POSIX SIG SIGTERM} eCode eMessage} {
+                    throw
+                } catch {{*} eCode eMessage} {
+                    ui_error [msgcat::mc "Fetching %s failed: %s" $source $error]
                     incr numfailed
                     continue
                 }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140408/e808e64a/attachment.html>