<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/dfa06ba03bda149e03e83ec47627bfeca2454d68">https://github.com/macports/macports-base/commit/dfa06ba03bda149e03e83ec47627bfeca2454d68</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 dfa06ba0 Fix conflicting variable name
</span>dfa06ba0 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit dfa06ba03bda149e03e83ec47627bfeca2454d68
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Thu Apr 21 18:14:44 2022 +1000
<span style='display:block; white-space:pre;color:#404040;'> Fix conflicting variable name
</span>---
src/macports1.0/macports.tcl | 8 ++++----
1 file changed, 4 insertions(+), 4 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 ebd4f312..c1f34bfe 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;'>@@ -2590,10 +2590,10 @@ proc macports::getindex {source} {
</span> # @param portDir Path to directory to prepare to operate on.
# @param state Variable name to save relevant state in. Pass this to
# VCSCleanup after running the VCS commands.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-proc macports::VCSPrepare {dir state} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+proc macports::VCSPrepare {dir statevar} {
</span> if {[getuid] == 0} {
global env macports::user_ssh_auth_sock
<span style='display:block; white-space:pre;background:#ffe0e0;'>- upvar $state state
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ upvar $statevar state
</span> # Must change egid before dropping root euid.
set state(oldEGID) [getegid]
set newEGID [name_to_gid [file attributes $dir -group]]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2618,9 +2618,9 @@ proc macports::VCSPrepare {dir state} {
</span> # including restoring privileges.
#
# @param state Variable name that was passed to VCSPrepare previously.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-proc macports::VCSCleanup {state} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+proc macports::VCSCleanup {statevar} {
</span> if {[getuid] == 0} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- upvar $state state
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ upvar $statevar state
</span> seteuid $state(oldEUID)
setegid $state(oldEGID)
array unset env *
</pre><pre style='margin:0'>
</pre>