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

[petr at macports.org]

Revision: 146634
          https://trac.macports.org/changeset/146634
Author:   petr at macports.org
Date:     2016-03-14 09:45:05 -0700 (Mon, 14 Mar 2016)
Log Message:
-----------
base: use try -pass_signal option in some places in macports.tcl

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

Modified: trunk/base/src/macports1.0/macports.tcl
===================================================================
--- trunk/base/src/macports1.0/macports.tcl	2016-03-14 16:41:18 UTC (rev 146633)
+++ trunk/base/src/macports1.0/macports.tcl	2016-03-14 16:45:05 UTC (rev 146634)
@@ -2621,13 +2621,8 @@
                     set progressflag "--progress ${macports::ui_options(progress_download)}"
                     set verboseflag ""
                 }
-
-                try {
+                try -pass_signal {
                     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 $eMessage]
                     incr numfailed
@@ -2749,7 +2744,7 @@
         if {[catch {set fd [open [macports::getindex $source] r]} result]} {
             ui_warn "Can't open index file for source: $source"
         } else {
-            try {
+            try -pass_signal {
                 incr found 1
                 while {[gets $fd line] >= 0} {
                     array unset portinfo
@@ -3049,7 +3044,7 @@
         ui_warn "Can't open index file: $index"
         return -code error
     } else {
-        try {
+        try -pass_signal {
             set offset [tell $indexfd]
             set quicklist {}
             while {[gets $indexfd line] >= 0} {
@@ -3064,10 +3059,6 @@
                 set offset [tell $indexfd]
             }
             puts -nonewline $quickfd $quicklist
-        } 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
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160314/be897190/attachment.html>