<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[146637] trunk/base/src/port1.0</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/146637">146637</a></dd>
<dt>Author</dt> <dd>cal@macports.org</dd>
<dt>Date</dt> <dd>2016-03-14 09:55:15 -0700 (Mon, 14 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>port1.0: Adapt to try -pass_signal from <a href="https://trac.macports.org/changeset/146633">r146633</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbasesrcport10portcleantcl">trunk/base/src/port1.0/portclean.tcl</a></li>
<li><a href="#trunkbasesrcport10portdistchecktcl">trunk/base/src/port1.0/portdistcheck.tcl</a></li>
<li><a href="#trunkbasesrcport10portfetchtcl">trunk/base/src/port1.0/portfetch.tcl</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbasesrcport10portcleantcl"></a>
<div class="modfile"><h4>Modified: trunk/base/src/port1.0/portclean.tcl (146636 => 146637)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/port1.0/portclean.tcl 2016-03-14 16:50:26 UTC (rev 146636)
+++ trunk/base/src/port1.0/portclean.tcl 2016-03-14 16:55:15 UTC (rev 146637)
</span><span class="lines">@@ -214,14 +214,8 @@
</span><span class="cx">
</span><span class="cx"> if {[file isdirectory $subbuildpath]} {
</span><span class="cx"> ui_debug "Removing directory: ${subbuildpath}"
</span><del>- try {
</del><ins>+ try -pass_signal {
</ins><span class="cx"> delete $subbuildpath
</span><del>- } catch {{POSIX SIG SIGINT} eCode eMessage} {
- ui_debug [msgcat::mc "Aborted due to SIGINT"]
- throw
- } catch {{POSIX SIG SINTERM} eCode eMessage} {
- ui_debug [msgcat::mc "Aborted due to SIGTERM"]
- throw
</del><span class="cx"> } catch {{*} eCode eMessage} {
</span><span class="cx"> ui_debug "$::errorInfo"
</span><span class="cx"> ui_error "$eMessage"
</span><span class="lines">@@ -234,14 +228,8 @@
</span><span class="cx">
</span><span class="cx"> if {!$usealtworkpath && [file isdirectory ${altprefix}${subbuildpath}]} {
</span><span class="cx"> ui_debug "Removing directory: ${altprefix}${subbuildpath}"
</span><del>- try {
</del><ins>+ try -pass_signal {
</ins><span class="cx"> delete ${altprefix}${subbuildpath}
</span><del>- } catch {{POSIX SIG SIGINT} eCode eMessage} {
- ui_debug [msgcat::mc "Aborted due to SIGINT"]
- throw
- } catch {{POSIX SIG SINTERM} eCode eMessage} {
- ui_debug [msgcat::mc "Aborted due to SIGTERM"]
- throw
</del><span class="cx"> } catch {{*} eCode eMessage} {
</span><span class="cx"> ui_debug "$::errorInfo"
</span><span class="cx"> ui_error "$eMessage"
</span></span></pre></div>
<a id="trunkbasesrcport10portdistchecktcl"></a>
<div class="modfile"><h4>Modified: trunk/base/src/port1.0/portdistcheck.tcl (146636 => 146637)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/port1.0/portdistcheck.tcl 2016-03-14 16:50:26 UTC (rev 146636)
+++ trunk/base/src/port1.0/portdistcheck.tcl 2016-03-14 16:55:15 UTC (rev 146637)
</span><span class="lines">@@ -85,18 +85,12 @@
</span><span class="cx"> foreach site $urlmap($url_var) {
</span><span class="cx"> ui_debug [format [msgcat::mc "Checking %s from %s"] $distfile $site]
</span><span class="cx"> set file_url [portfetch::assemble_url $site $distfile]
</span><del>- try {
</del><ins>+ try -pass_signal {
</ins><span class="cx"> set urlnewer [curl isnewer {*}$curl_options $file_url $port_moddate]
</span><span class="cx"> if {$urlnewer} {
</span><span class="cx"> ui_warn "port $subport: $file_url is newer than Portfile"
</span><span class="cx"> }
</span><span class="cx"> incr count
</span><del>- } catch {{POSIX SIG SIGINT} eCode eMessage} {
- ui_debug [msgcat::mc "Aborted due to SIGINT"]
- throw
- } catch {{POSIX SIG SIGTERM} eCode eMessage} {
- ui_debug [msgcat::mc "Aborted due to SIGTERM"]
- throw
</del><span class="cx"> } catch {{*} eCode eMessage} {
</span><span class="cx"> ui_debug [msgcat::mc "couldn't fetch %s for %s (%s)" $file_url $subport $eMessage]
</span><span class="cx"> }
</span><span class="lines">@@ -109,7 +103,7 @@
</span><span class="cx"> foreach site $urlmap($url_var) {
</span><span class="cx"> ui_debug [format [msgcat::mc "Checking %s from %s"] $distfile $site]
</span><span class="cx"> set file_url [portfetch::assemble_url $site $distfile]
</span><del>- try {
</del><ins>+ try -pass_signal {
</ins><span class="cx"> set urlsize [curl getsize {*}$curl_options $file_url]
</span><span class="cx"> incr count
</span><span class="cx"> if {$urlsize > 0} {
</span><span class="lines">@@ -117,12 +111,6 @@
</span><span class="cx"> incr totalsize $urlsize
</span><span class="cx"> break
</span><span class="cx"> }
</span><del>- } catch {{POSIX SIG SIGINT} eCode eMessage} {
- ui_debug [msgcat::mc "Aborted due to SIGINT"]
- throw
- } catch {{POSIX SIG SIGTERM} eCode eMessage} {
- ui_debug [msgcat::mc "Aborted due to SIGTERM"]
- throw
</del><span class="cx"> } catch {{*} eCode eMessage} {
</span><span class="cx"> ui_debug [msgcat::mc "couldn't fetch %s for %s (%s)" $file_url $subport $eMessage]
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkbasesrcport10portfetchtcl"></a>
<div class="modfile"><h4>Modified: trunk/base/src/port1.0/portfetch.tcl (146636 => 146637)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/port1.0/portfetch.tcl 2016-03-14 16:50:26 UTC (rev 146636)
+++ trunk/base/src/port1.0/portfetch.tcl 2016-03-14 16:55:15 UTC (rev 146637)
</span><span class="lines">@@ -539,22 +539,16 @@
</span><span class="cx"> foreach site $urlmap($url_var) {
</span><span class="cx"> ui_notice "$UI_PREFIX [format [msgcat::mc "Attempting to fetch %s from %s"] $distfile $site]"
</span><span class="cx"> set file_url [portfetch::assemble_url $site $distfile]
</span><del>- try {
</del><ins>+ try -pass_signal {
</ins><span class="cx"> curl fetch {*}$fetch_options $file_url "${distpath}/${distfile}.TMP"
</span><span class="cx"> file rename -force "${distpath}/${distfile}.TMP" "${distpath}/${distfile}"
</span><span class="cx"> set fetched 1
</span><span class="cx"> break
</span><del>- } catch {{POSIX SIG SIGINT} eCode eMessage} {
- ui_debug [msgcat::mc "Aborted fetching distfile due to SIGINT"]
- file delete -force "${distpath}/${distfile}.TMP"
- throw
- } catch {{POSIX SIG SIGTERM} eCode eMessage} {
- ui_debug [msgcat::mc "Aborted fetching distfile due to SIGTERM"]
- file delete -force "${distpath}/${distfile}.TMP"
- throw
</del><span class="cx"> } catch {{*} eCode eMessage} {
</span><span class="cx"> ui_debug [msgcat::mc "Fetching distfile failed: %s" $eMessage]
</span><span class="cx"> set lastError $eMessage
</span><ins>+ } finally {
+ file delete -force "${distpath}/${distfile}.TMP"
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> if {![info exists fetched]} {
</span></span></pre>
</div>
</div>
</body>
</html>