<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch release-2.9
in repository macports-base.
</pre>
<p><a href="https://github.com/macports/macports-base/commit/c63ccebc9e5ac5e707722cb1c1186f2d48f6f3bf">https://github.com/macports/macports-base/commit/c63ccebc9e5ac5e707722cb1c1186f2d48f6f3bf</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit c63ccebc9e5ac5e707722cb1c1186f2d48f6f3bf
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Thu Jan 25 23:43:38 2024 +1100
<span style='display:block; white-space:pre;color:#404040;'> Don't use pure list when variable substitution is wanted
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Turns out list quoting will prevent further substitution from happening
</span><span style='display:block; white-space:pre;color:#404040;'> in the child interpreter too, not just the calling one.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> (cherry picked from commit 16903ba46f55362fc937ae1af5080b5251d1004f)
</span>---
src/macports1.0/macports.tcl | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/macports1.0/macports.tcl b/src/macports1.0/macports.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index bd8f38a73..b812e5545 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/macports1.0/macports.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/macports1.0/macports.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2244,7 +2244,7 @@ proc _mportsearchpath {depregex search_path {executable 0} {return_match 0}} {
</span> proc _mportinstalled {mport} {
# Check for the presence of the port in the registry
set workername [ditem_key $mport workername]
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return [$workername eval [list registry_exists_for_name \$subport]]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return [$workername eval {registry_exists_for_name $subport}]
</span> }
# Determine if a port is active
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4045,7 +4045,7 @@ proc macports::_deptypes_for_target {target workername} {
</span> activate -
{} {
if {[global_option_isset ports_binary_only] ||
<span style='display:block; white-space:pre;background:#ffe0e0;'>- [$workername eval [list registry_exists \$subport \$version \$revision \$portvariants]]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [$workername eval {registry_exists $subport $version $revision $portvariants}]
</span> || (![global_option_isset ports_source_only] && [$workername eval [list _archive_available]])} {
return [list depends_lib depends_run]
} else {
</pre><pre style='margin:0'>
</pre>