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

[cal at macports.org]

Revision: 137302
          https://trac.macports.org/changeset/137302
Author:   cal at macports.org
Date:     2015-06-08 11:36:07 -0700 (Mon, 08 Jun 2015)
Log Message:
-----------
base: Make Portfile downloading signal-transparent

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

Modified: trunk/base/src/macports1.0/macports.tcl
===================================================================
--- trunk/base/src/macports1.0/macports.tcl	2015-06-08 18:30:34 UTC (rev 137301)
+++ trunk/base/src/macports1.0/macports.tcl	2015-06-08 18:36:07 UTC (rev 137302)
@@ -2625,7 +2625,7 @@
                 } catch {{POSIX SIG SIGTERM} eCode eMessage} {
                     throw
                 } catch {{*} eCode eMessage} {
-                    ui_error [msgcat::mc "Fetching %s failed: %s" $source $error]
+                    ui_error [msgcat::mc "Fetching %s failed: %s" $source $eMessage]
                     incr numfailed
                     continue
                 }
@@ -3060,7 +3060,11 @@
                 set offset [tell $indexfd]
             }
             puts -nonewline $quickfd $quicklist
-        } catch * {
+        } catch {{POSIX SIG SIGINT} eCode eMessage} {
+            throw
+        } catch {{POSIX SIG SIGTERM} eCode eMessage} {
+            throw
+        } catch {{*} eCode eMessage} {
             ui_warn "It looks like your PortIndex file $index may be corrupt."
             throw
         } finally {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150608/bb599a6f/attachment-0001.html>