<!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>[117702] trunk/base/src/port/port.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/117702">117702</a></dd>
<dt>Author</dt> <dd>cal@macports.org</dd>
<dt>Date</dt> <dd>2014-03-08 09:24:15 -0800 (Sat, 08 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>port select --summary: format all lines equally, sort the "none" option to the back</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbasesrcportporttcl">trunk/base/src/port/port.tcl</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbasesrcportporttcl"></a>
<div class="modfile"><h4>Modified: trunk/base/src/port/port.tcl (117701 => 117702)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/port/port.tcl 2014-03-08 16:28:17 UTC (rev 117701)
+++ trunk/base/src/port/port.tcl 2014-03-08 17:24:15 UTC (rev 117702)
</span><span class="lines">@@ -2614,25 +2614,41 @@
</span><span class="cx"> set w1 4
</span><span class="cx"> set w2 8
</span><span class="cx"> set formatStr "%-*s %-*s %s"
</span><del>- puts [format $formatStr $w1 "Name" $w2 "Selected" "Options"]
</del><ins>+
+ set groups [list]
</ins><span class="cx"> foreach pg $portgroups {
</span><ins>+ array set groupdesc {}
+ set groupdesc(name) [string trim $pg]
+
</ins><span class="cx"> if {[catch {mportselect list $pg} versions]} {
</span><del>- ui_error "The list of versions could not be obtained: $versions"
- return 1
</del><ins>+ ui_warn "The list of options for the select group $pg could not be obtained: $versions"
+ continue
</ins><span class="cx"> }
</span><ins>+ # remove "none", sort the list, append none at the end
+ set noneidx [lsearch -exact $versions "none"]
+ set versions [lsort [lreplace $versions $noneidx $noneidx]]
+ lappend versions "none"
+ set groupdesc(versions) $versions
</ins><span class="cx">
</span><del>- foreach v $versions {
- if {[catch {mportselect show $pg} selected_version]} {
- ui_error "The 'show' command failed: $selected_version"
- return 1
- }
</del><ins>+ if {[catch {mportselect show $pg} selected_version]} {
+ ui_warn "The currently selected option for the select group $pg could not be obtained: $selected_version"
+ continue
</ins><span class="cx"> }
</span><ins>+ set groupdesc(selected) $selected_version
</ins><span class="cx">
</span><span class="cx"> set w1 [expr {max($w1, [string length $pg])}]
</span><span class="cx"> set w2 [expr {max($w2, [string length $selected_version])}]
</span><span class="cx">
</span><del>- puts [format $formatStr $w1 [string trim $pg] $w2 $selected_version [join $versions " "]]
</del><ins>+ lappend groups [array get groupdesc]
+ array unset groupdesc
</ins><span class="cx"> }
</span><ins>+ puts [format $formatStr $w1 "Name" $w2 "Selected" "Options"]
+ puts [format $formatStr $w1 "====" $w2 "========" "======="]
+ foreach groupdesc $groups {
+ array set groupd $groupdesc
+ puts [format $formatStr $w1 $groupd(name) $w2 $groupd(selected) [join $groupd(versions) " "]]
+ array unset groupd
+ }
</ins><span class="cx"> return 0
</span><span class="cx"> }
</span><span class="cx"> default {
</span></span></pre>
</div>
</div>
</body>
</html>