<!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>[146741] 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/146741">146741</a></dd>
<dt>Author</dt> <dd>ijackson@macports.org</dd>
<dt>Date</dt> <dd>2016-03-16 10:26:29 -0700 (Wed, 16 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use the ui_ask_alternative API.
Use the ui_ask_alternative API implemented in <a href="https://trac.macports.org/changeset/146738">r146738</a>.</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 (146740 => 146741)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/macports1.0/reclaim.tcl 2016-03-16 16:12:19 UTC (rev 146740)
+++ trunk/base/src/macports1.0/reclaim.tcl 2016-03-16 17:26:29 UTC (rev 146741)
</span><span class="lines">@@ -195,61 +195,59 @@
</span><span class="cx"> incr size_superfluous_files [file size $f]
</span><span class="cx"> }
</span><span class="cx"> if {[llength $superfluous_files] > 0} {
</span><del>- ui_msg [msgcat::mc \
- "Found %d files (total %s) that are no longer needed and can be deleted." \
- $num_superfluous_files \
- [bytesize $size_superfluous_files]]
- while {1} {
- ui_msg "\[D]elete / \[k]eep / \[l]ist: "
- switch [gets stdin] {
- d -
- D {
- ui_msg "Deleting..."
- foreach f $superfluous_files {
- set root_length [string length "${root_dist}/"]
- set home_length [string length "${home_dist}/"]
</del><ins>+ if {[info exists macports::ui_options(questions_alternative)]} {
+ array set alternatives {d delete k keep l list}
+ set retstring [$macports::ui_options(questions_alternative) [msgcat::mc \
+ "Found %d files (total %s) that are no longer needed and can be deleted." \
+ $num_superfluous_files [bytesize $size_superfluous_files]] "deleteFilesQ" "alternatives" {k}]
+
+ while 1 {
+ switch $retstring {
+ d {
+ ui_msg "Deleting..."
+ foreach f $superfluous_files {
+ set home_length [string length "${home_dist}/"]
</ins><span class="cx">
</span><del>- try -pass_signal {
- ui_info [msgcat::mc "Deleting unused file %s" $f]
- file delete -- $f
</del><ins>+ try -pass_signal {
+ ui_info [msgcat::mc "Deleting unused file %s" $f]
+ file delete -- $f
</ins><span class="cx">
</span><del>- set directory [file dirname $f]
- while {1} {
- set is_below_root [string equal -length $root_length $directory "${root_dist}/"]
- set is_below_home [string equal -length $home_length $directory "${home_dist}/"]
</del><ins>+ set directory [file dirname $f]
+ while {1} {
+ set is_below_root [string equal -length $root_length $directory "${root_dist}/"]
+ set is_below_home [string equal -length $home_length $directory "${home_dist}/"]
</ins><span class="cx">
</span><del>- if {!$is_below_root && !$is_below_home} {
- break
- }
</del><ins>+ if {!$is_below_root && !$is_below_home} {
+ break
+ }
</ins><span class="cx">
</span><del>- if {[llength [readdir $directory]] > 0} {
- break
- }
</del><ins>+ if {[llength [readdir $directory]] > 0} {
+ break
+ }
</ins><span class="cx">
</span><del>- ui_info [msgcat::mc "Deleting empty directory %s" $directory]
- try -pass_signal {
- file delete -- $directory
- } catch {{*} eCode eMessage} {
- ui_warn [msgcat::mc "Could not delete empty directory %s: %s" $directory $eMesage]
</del><ins>+ ui_info [msgcat::mc "Deleting empty directory %s" $directory]
+ try -pass_signal {
+ file delete -- $directory
+ } catch {{*} eCode eMessage} {
+ ui_warn [msgcat::mc "Could not delete empty directory %s: %s" $directory $eMesage]
+ }
+ set directory [file dirname $directory]
</ins><span class="cx"> }
</span><del>- set directory [file dirname $directory]
</del><ins>+ } catch {{*} eCode eMessage} {
+ ui_warn [msgcat::mc "Could not delete %s: %s" $f $eMessage]
</ins><span class="cx"> }
</span><del>- } catch {{*} eCode eMessage} {
- ui_warn [msgcat::mc "Could not delete %s: %s" $f $eMessage]
</del><span class="cx"> }
</span><ins>+ break
</ins><span class="cx"> }
</span><del>- break
- }
- k -
- K {
- ui_msg "OK, keeping the files."
- break
- }
- l -
- L {
- foreach f $superfluous_files {
- ui_msg " $f"
</del><ins>+ k {
+ ui_msg "OK, keeping the files."
+ break
</ins><span class="cx"> }
</span><ins>+ l {
+ foreach f $superfluous_files {
+ ui_msg " $f"
+ }
+ }
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>