<!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>[117607] trunk/base/src</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/117607">117607</a></dd>
<dt>Author</dt> <dd>snc@macports.org</dd>
<dt>Date</dt> <dd>2014-03-05 07:34:11 -0800 (Wed, 05 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>base: add port select --summary, #36179</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbasesrcmacports10macportstcl">trunk/base/src/macports1.0/macports.tcl</a></li>
<li><a href="#trunkbasesrcportporttcl">trunk/base/src/port/port.tcl</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbasesrcmacports10macportstcl"></a>
<div class="modfile"><h4>Modified: trunk/base/src/macports1.0/macports.tcl (117606 => 117607)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/macports1.0/macports.tcl 2014-03-05 10:10:46 UTC (rev 117606)
+++ trunk/base/src/macports1.0/macports.tcl 2014-03-05 15:34:11 UTC (rev 117607)
</span><span class="lines">@@ -4192,12 +4192,12 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> # mportselect
</span><del>-# * command: The only valid commands are list, set and show
</del><ins>+# * command: The only valid commands are list, set, show and summary
</ins><span class="cx"> # * group: This argument should correspond to a directory under
</span><span class="cx"> # ${macports::prefix}/etc/select.
</span><span class="cx"> # * version: This argument is only used by the 'set' command.
</span><span class="cx"> # On error mportselect returns with the code 'error'.
</span><del>-proc mportselect {command group {version {}}} {
</del><ins>+proc mportselect {command {group ""} {version {}}} {
</ins><span class="cx"> ui_debug "mportselect \[$command] \[$group] \[$version]"
</span><span class="cx">
</span><span class="cx"> set conf_path ${macports::prefix}/etc/select/$group
</span><span class="lines">@@ -4226,6 +4226,16 @@
</span><span class="cx"> }
</span><span class="cx"> return [lsort $lversions]
</span><span class="cx"> }
</span><ins>+ summary {
+ # Return the list of portgroups in ${macports::prefix}/etc/select
+ if {[catch {set lportgroups [glob -directory $conf_path -tails *]} result]} {
+ global errorInfo
+ ui_debug "${result}: $errorInfo"
+ return -code error [concat "No ports with the select" \
+ "option were found."]
+ }
+ return [lsort $lportgroups]
+ }
</ins><span class="cx"> set {
</span><span class="cx"> # Use ${conf_path}/$version to read in sources.
</span><span class="cx"> if {$version eq {} || $version eq {base} || $version eq {current}
</span></span></pre></div>
<a id="trunkbasesrcportporttcl"></a>
<div class="modfile"><h4>Modified: trunk/base/src/port/port.tcl (117606 => 117607)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/port/port.tcl 2014-03-05 10:10:46 UTC (rev 117606)
+++ trunk/base/src/port/port.tcl 2014-03-05 15:34:11 UTC (rev 117607)
</span><span class="lines">@@ -463,7 +463,7 @@
</span><span class="cx">
</span><span class="cx"> # Execute the enclosed block once for every element in the portlist
</span><span class="cx"> # When the block is entered, the following variables will have been set:
</span><del>-# portspec, porturl, portname, portversion, options, variations, requested_variations
</del><ins>+# portspec, porturl, portname, portversion, options, variations, requested_variations
</ins><span class="cx"> proc foreachport {portlist block} {
</span><span class="cx"> set savedir [pwd]
</span><span class="cx"> foreach portspec $portlist {
</span><span class="lines">@@ -2504,18 +2504,20 @@
</span><span class="cx"> proc action_select { action portlist opts } {
</span><span class="cx"> ui_debug "action_select \[$portlist] \[$opts]..."
</span><span class="cx">
</span><del>- # Error out if no group is specified.
- if {[llength $portlist] < 1} {
- ui_error "port select \[--list|--set|--show] <group> \[<version>]"
</del><ins>+ array set opts_array $opts
+ set commands [array names opts_array ports_select_*]
+ array unset opts_array
+
+ # Error out if no group is specified or command is not --summary.
+ if {[llength $portlist] < 1 && [string map {ports_select_ ""} [lindex $commands 0]] != "summary"} {
+ ui_error "port select \[--list|--set|--show|--summary] \<group> \[<version>]"
</ins><span class="cx"> return 1
</span><span class="cx"> }
</span><ins>+
</ins><span class="cx"> set group [lindex $portlist 0]
</span><del>-
- array set opts_array $opts
- set commands [array names opts_array ports_select_*]
- array unset opts_array
- # If no command (--set, --show, --list) is specified *but* more than one
- # argument is specified, default to the set command.
</del><ins>+
+ # If no command (--set, --show, --list, --summary) is specified *but*
+ # more than one argument is specified, default to the set command.
</ins><span class="cx"> if {[llength $commands] < 1 && [llength $portlist] > 1} {
</span><span class="cx"> set command set
</span><span class="cx"> ui_debug [concat "Although no command was specified, more than " \
</span><span class="lines">@@ -2601,6 +2603,41 @@
</span><span class="cx"> "'$selected_version'."]
</span><span class="cx"> return 0
</span><span class="cx"> }
</span><ins>+ summary {
+ if {[llength $portlist] > 0} {
+ ui_warn [concat "The 'summary' command does not expect any " \
+ "arguments. Extra arguments will be ignored."]
+ }
+
+ if {[catch {mportselect $command} portgroups]} {
+ ui_error "The 'summary' command failed: $portgroups"
+ return 1
+ }
+
+ set w1 4
+ set w2 8
+ set formatStr "%-*s %-*s %s"
+ puts [format $formatStr $w1 "Name" $w2 "Selected" "Options"]
+ foreach pg $portgroups {
+ if {[catch {mportselect list $pg} versions]} {
+ ui_error "The list of versions could not be obtained: $versions"
+ return 1
+ }
+
+ foreach v $versions {
+ if {[catch {mportselect show $pg} selected_version]} {
+ ui_error "The 'show' command failed: $selected_version"
+ return 1
+ }
+ }
+
+ set w1 [expr {max($w1, [string length $pg])}]
+ set w2 [expr {max($w2, [string length $selected_version])}]
+
+ puts [format $formatStr $w1 [string trim $pg] $w2 $selected_version [join $versions " "]]
+ }
+ return 0
+ }
</ins><span class="cx"> default {
</span><span class="cx"> ui_error "An unknown command '$command' was specified."
</span><span class="cx"> return 1
</span><span class="lines">@@ -4294,7 +4331,7 @@
</span><span class="cx"> clean {all archive dist work logs}
</span><span class="cx"> mirror {new}
</span><span class="cx"> lint {nitpick}
</span><del>- select {list set show}
</del><ins>+ select {list set show summary}
</ins><span class="cx"> log {{phase 1} {level 1}}
</span><span class="cx"> upgrade {force enforce-variants no-replace no-rev-upgrade}
</span><span class="cx"> rev-upgrade {id-loadcmd-check}
</span></span></pre>
</div>
</div>
</body>
</html>