<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/c9bd1e0a824108668f453686b3ab3db7279fed28">https://github.com/macports/macports-base/commit/c9bd1e0a824108668f453686b3ab3db7279fed28</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 c9bd1e0a8 fix test
</span>c9bd1e0a8 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit c9bd1e0a824108668f453686b3ab3db7279fed28
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Tue Mar 5 23:41:44 2024 +1100
<span style='display:block; white-space:pre;color:#404040;'> fix test
</span>---
src/port1.0/portutil.tcl | 4 +---
src/port1.0/tests/portutil.test | 5 +++--
2 files changed, 4 insertions(+), 5 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 eceb167eb..e9b839a59 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;'>@@ -989,7 +989,7 @@ proc ldelete {list value} {
</span> # reinplace
# Provides "sed in place" functionality
proc reinplace {args} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- global env workpath worksrcpath
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ global UI_PREFIX env workpath worksrcpath
</span> set extended 0
set suppress 0
set quiet 0
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1047,8 +1047,6 @@ proc reinplace {args} {
</span> }
foreach file $files {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- global UI_PREFIX
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # if $file is an absolute path already, file join will just return the
# absolute path, otherwise it is $dir/$file
set file [file join $dir $file]
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/port1.0/tests/portutil.test b/src/port1.0/tests/portutil.test
</span><span style='display:block; white-space:pre;color:#808080;'>index fd062c5b9..a477404a6 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/port1.0/tests/portutil.test
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/port1.0/tests/portutil.test
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -257,6 +257,7 @@ test reinplace {
</span> } -setup {
global macportsuser
set macportsuser macports
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ set_ui_prefix
</span>
set root "/tmp/macports-portutil-reinplace"
file delete -force $root
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -776,11 +777,11 @@ test set_ui_prefix {
</span> } -body {
set env(UI_PREFIX) MacPorts
set_ui_prefix
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {$UI_PREFIX != "MacPorts"} {return "FAIL: incorrect prefix"}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {$UI_PREFIX ne "MacPorts"} {return "FAIL: incorrect prefix"}
</span>
unset env(UI_PREFIX)
set_ui_prefix
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {$UI_PREFIX != "---> "} {return "FAIL; default prefix not set"}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {$UI_PREFIX ne "---> "} {return "FAIL; default prefix not set"}
</span> return "Set_ui_prefix successful."
} -result "Set_ui_prefix successful."
</pre><pre style='margin:0'>
</pre>