<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/4106e3257e6c40140221520eec563904e72157c8">https://github.com/macports/macports-base/commit/4106e3257e6c40140221520eec563904e72157c8</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 4106e3257e6c40140221520eec563904e72157c8
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Wed May 14 23:49:13 2025 +1000
<span style='display:block; white-space:pre;color:#404040;'> target_run: simplify expressions
</span>---
src/port1.0/portutil.tcl | 13 ++++---------
1 file changed, 4 insertions(+), 9 deletions(-)
<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 65f9892b4..20a588d30 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;'>@@ -1431,10 +1431,9 @@ proc target_run {ditem} {
</span>
#start tracelib
set tracing no
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {($result == 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {$result == 0
</span> && [tbool ports_trace]
<span style='display:block; white-space:pre;background:#ffe0e0;'>- && $target ne "clean"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- && $target ne "uninstall")} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ && $target ni {clean uninstall}} {
</span> # uninstall will open a portfile from registry and call
# deactivate and uninstall there; if we enable trace mode
# for the first level the two trace threads will conflict
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1443,10 +1442,7 @@ proc target_run {ditem} {
</span>
# Enable the fence to prevent any creation/modification
# outside the sandbox.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {$target ne "activate"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- && $target ne "deactivate"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- && $target ne "archive"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- && $target ne "install"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {$target ni {activate archive deactivate install}} {
</span> porttrace::trace_enable_fence
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1551,8 +1547,7 @@ proc target_run {ditem} {
</span> # Check dependencies & file creations outside workpath.
if {[tbool ports_trace]
&& $tracing
<span style='display:block; white-space:pre;background:#ffe0e0;'>- && $target ne "clean"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- && $target ne "uninstall"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ && $target ni {clean uninstall}} {
</span>
tracelib closesocket
</pre><pre style='margin:0'>
</pre>