<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository macports-base.
</pre>
<p><a href="https://github.com/macports/macports-base/commit/33fa555238be419bf992ca0fb11597bb8c5784f3">https://github.com/macports/macports-base/commit/33fa555238be419bf992ca0fb11597bb8c5784f3</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 33fa555 Only consider relevant actions for expansion
</span>33fa555 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 33fa555238be419bf992ca0fb11597bb8c5784f3
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Fri Aug 25 05:56:00 2017 +1000
<span style='display:block; white-space:pre;color:#404040;'> Only consider relevant actions for expansion
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> The cd, quit and exit actions are only useful in shell/batch mode. So, ignore
</span><span style='display:block; white-space:pre;color:#404040;'> them when considering what an abbreviated action could expand to, when not in
</span><span style='display:block; white-space:pre;color:#404040;'> that mode.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: #29
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/32866
</span>---
src/port/port.tcl | 15 ++++++++++++++-
1 file changed, 14 insertions(+), 1 deletion(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/port/port.tcl b/src/port/port.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index a70c975..e9b7503 100755
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/port/port.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/port/port.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4365,13 +4365,26 @@ array set action_array [list \
</span> exit [list action_exit [ACTION_ARGS_NONE]] \
]
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Actions which are only valid in shell mode
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set shellmode_action_list [list cd exit quit]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # Expand "action".
# Returns a list of matching actions.
proc find_action { action } {
global action_array
if {![info exists action_array($action)]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return [array names action_array [string tolower $action]*]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # list of actions that are valid for this mode
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ global action_list
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![info exists action_list]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ global ui_options shellmode_action_list
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![info exists ui_options(ports_commandfiles)]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set action_list [lsearch -regexp -all -inline -not [array names action_array] ^[join $shellmode_action_list {$|^}]$]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set action_list [array names action_array]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return [lsearch -glob -inline -all $action_list [string tolower $action]*]
</span> }
return $action
</pre><pre style='margin:0'>
</pre>