<!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>[146699] trunk/base/src/macports1.0/reclaim.tcl</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/146699">146699</a></dd>
<dt>Author</dt> <dd>cal@macports.org</dd>
<dt>Date</dt> <dd>2016-03-15 08:43:50 -0700 (Tue, 15 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>base: reclaim: Fix signals being swallowed</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbasesrcmacports10reclaimtcl">trunk/base/src/macports1.0/reclaim.tcl</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbasesrcmacports10reclaimtcl"></a>
<div class="modfile"><h4>Modified: trunk/base/src/macports1.0/reclaim.tcl (146698 => 146699)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/macports1.0/reclaim.tcl 2016-03-15 15:41:03 UTC (rev 146698)
+++ trunk/base/src/macports1.0/reclaim.tcl 2016-03-15 15:43:50 UTC (rev 146699)
</span><span class="lines">@@ -137,9 +137,11 @@
</span><span class="cx"> set variants [lindex $port 3]
</span><span class="cx">
</span><span class="cx"> # Get mport reference
</span><del>- if {[catch {set mport [mportopen_installed $name $version $revision $variants {}]} error]} {
</del><ins>+ try -pass_signal {
+ set mport [mportopen_installed $name $version $revision $variants {}]
+ } catch {{*} eCode eMessage} {
</ins><span class="cx"> $progress intermission
</span><del>- ui_warn [msgcat::mc "Failed to open port %s from registry: %s" $name $error]
</del><ins>+ ui_warn [msgcat::mc "Failed to open port %s from registry: %s" $name $eMessage]
</ins><span class="cx"> continue
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -207,7 +209,7 @@
</span><span class="cx"> set root_length [string length "${root_dist}/"]
</span><span class="cx"> set home_length [string length "${home_dist}/"]
</span><span class="cx">
</span><del>- try {
</del><ins>+ try -pass_signal {
</ins><span class="cx"> ui_info [msgcat::mc "Deleting unused file %s" $f]
</span><span class="cx"> file delete -- $f
</span><span class="cx">
</span><span class="lines">@@ -225,7 +227,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ui_info [msgcat::mc "Deleting empty directory %s" $directory]
</span><del>- try {
</del><ins>+ try -pass_signal {
</ins><span class="cx"> file delete -- $directory
</span><span class="cx"> } catch {{*} eCode eMessage} {
</span><span class="cx"> ui_warn [msgcat::mc "Could not delete empty directory %s: %s" $directory $eMesage]
</span><span class="lines">@@ -258,19 +260,6 @@
</span><span class="cx"> return 0
</span><span class="cx"> }
</span><span class="cx">
</span><del>- proc close_file {file} {
-
- # Closes the file, handling error catching if needed.
- #
- # Args:
- # file - The file handler
- # Returns:
- # None
- if {[catch {close $file} error]} {
- ui_error "something went wrong when closing file, $file."
- }
- }
-
</del><span class="cx"> proc is_inactive {port} {
</span><span class="cx">
</span><span class="cx"> # Determines whether a port is inactive or not.
</span><span class="lines">@@ -298,12 +287,12 @@
</span><span class="cx"> # A multidimensional list where each port is a sublist, i.e., [{first port info} {second port info} {...}]
</span><span class="cx"> # Indexes of each sublist are: 0 = name, 1 = version, 2 = revision, 3 = variants, 4 = activity, and 5 = epoch.
</span><span class="cx">
</span><del>- if {[catch {set installed [registry::installed]} result]} {
</del><ins>+ try -pass_signal {
+ return [registry::installed]
+ } catch {*} {
</ins><span class="cx"> ui_error "no installed ports found."
</span><span class="cx"> return {}
</span><span class="cx"> }
</span><del>-
- return $installed
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> proc update_last_run {} {
</span><span class="lines">@@ -317,10 +306,16 @@
</span><span class="cx">
</span><span class="cx"> ui_debug "Updating last run information."
</span><span class="cx">
</span><del>- set path [file join ${macports::portdbpath} last_reclaim]
- set fd [open $path w]
- puts $fd [clock seconds]
- close_file $fd
</del><ins>+ set path [file join ${macports::portdbpath} last_reclaim]
+ set fd -1
+ try -pass_signal {
+ set fd [open $path w]
+ puts $fd [clock seconds]
+ } finally {
+ if {$fd != -1} {
+ close $fd
+ }
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> proc check_last_run {} {
</span><span class="lines">@@ -336,18 +331,21 @@
</span><span class="cx">
</span><span class="cx"> set path [file join ${macports::portdbpath} last_reclaim]
</span><span class="cx">
</span><del>- if {[file exists $path]} {
-
- set fd [open $path r]
- set time [gets $fd]
- close_file $fd
-
- if {$time ne ""} {
- if {[clock seconds] - $time > 1209600} {
- ui_warn "You haven't run 'port reclaim' in two weeks. It's recommended you run this every two weeks to reclaim disk space."
- }
</del><ins>+ set fd -1
+ set time ""
+ try -pass_signal {
+ set fd [open $path r]
+ set time [gets $fd]
+ } finally {
+ if {$fd != -1} {
+ close $fd
</ins><span class="cx"> }
</span><span class="cx"> }
</span><ins>+ if {$time ne ""} {
+ if {[clock seconds] - $time > 1209600} {
+ ui_warn "You haven't run 'port reclaim' in two weeks. It's recommended you run this every two weeks to reclaim disk space."
+ }
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> proc uninstall_inactive {} {
</span><span class="lines">@@ -392,8 +390,10 @@
</span><span class="cx"> ui_msg "Uninstalling: $name"
</span><span class="cx">
</span><span class="cx"> # Note: 'uninstall' takes a name, version, revision, variants and an options list.
</span><del>- if {[catch {registry_uninstall::uninstall $name [lindex $port 1] [lindex $port 2] [lindex $port 3] {}} error]} {
- ui_error "something went wrong when uninstalling $name"
</del><ins>+ try -pass_signal {
+ registry_uninstall::uninstall $name [lindex $port 1] [lindex $port 2] [lindex $port 3] {}
+ } catch {{*} eCode eMessage} {
+ ui_error "Error uninstalling $name: $eMessage"
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> } else {
</span></span></pre>
</div>
</div>
</body>
</html>