<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch release-2.7
in repository macports-base.
</pre>
<p><a href="https://github.com/macports/macports-base/commit/78e1b880199761e0dbf49216a402afbf3d384269">https://github.com/macports/macports-base/commit/78e1b880199761e0dbf49216a402afbf3d384269</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 78e1b880199761e0dbf49216a402afbf3d384269
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Sat Nov 20 00:28:18 2021 -0600
<span style='display:block; white-space:pre;color:#404040;'> Fix command_exec to honor -varprefix again
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> This was broken by da3524e8a3006a9b9a2370b66fa91bb554dd768b.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://trac.macports.org/ticket/64011
</span><span style='display:block; white-space:pre;color:#404040;'> (cherry picked from commit ce4235490972c60fad3b9bf7a1af605512ce3abd)
</span>---
src/port1.0/portutil.tcl | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/port1.0/portutil.tcl b/src/port1.0/portutil.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index ed25d4f9..fd26972c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/port1.0/portutil.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/port1.0/portutil.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -378,6 +378,7 @@ proc command_exec {args} {
</span> set notty ""
set command_prefix ""
set command_suffix ""
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ set varprefix ""
</span>
while {[llength $args] > 0} {
switch -glob -- [lindex $args 0] {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -411,7 +412,9 @@ proc command_exec {args} {
</span> }
set command [lindex $args 0]
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set varprefix "${command}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {$varprefix eq ""} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set varprefix "$command"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span>
if {[llength $args] > 1} {
set command_prefix [lindex $args 1]
</pre><pre style='margin:0'>
</pre>