<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/7f71db986d86a22d2145e609a6255e5b30c2e489">https://github.com/macports/macports-base/commit/7f71db986d86a22d2145e609a6255e5b30c2e489</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 7f71db98 fix activation failure
</span>7f71db98 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 7f71db986d86a22d2145e609a6255e5b30c2e489
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Fri Jan 29 16:42:16 2021 +1100
<span style='display:block; white-space:pre;color:#404040;'> fix activation failure
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Work around picky variable trace code on $version
</span>---
src/port1.0/portactivate.tcl | 4 ++--
src/port1.0/portdeactivate.tcl | 4 ++--
src/port1.0/portuninstall.tcl | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/port1.0/portactivate.tcl b/src/port1.0/portactivate.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index db157464..3049d30b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/port1.0/portactivate.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/port1.0/portactivate.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -60,9 +60,9 @@ proc portactivate::activate_start {args} {
</span>
proc portactivate::activate_main {args} {
global subport _inregistry_version _inregistry_revision _inregistry_variants prefix user_options
<span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach {var backup} {_inregistry_version ::version _inregistry_revision ::revision _inregistry_variants ::portvariants} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach {var backup} {_inregistry_version version _inregistry_revision revision _inregistry_variants portvariants} {
</span> if {![info exists $var]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set $var [set $backup]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set $var [option $backup]
</span> }
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/port1.0/portdeactivate.tcl b/src/port1.0/portdeactivate.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 7ab81bca..200e7188 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/port1.0/portdeactivate.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/port1.0/portdeactivate.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -57,9 +57,9 @@ proc portdeactivate::deactivate_start {args} {
</span>
proc portdeactivate::deactivate_main {args} {
global subport _inregistry_version _inregistry_revision _inregistry_variants user_options
<span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach {var backup} {_inregistry_version ::version _inregistry_revision ::revision _inregistry_variants ::portvariants} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach {var backup} {_inregistry_version version _inregistry_revision revision _inregistry_variants portvariants} {
</span> if {![info exists $var]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set $var [set $backup]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set $var [option $backup]
</span> }
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/port1.0/portuninstall.tcl b/src/port1.0/portuninstall.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index f0ed7850..3375ca99 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/port1.0/portuninstall.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/port1.0/portuninstall.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -57,9 +57,9 @@ proc portuninstall::uninstall_start {args} {
</span>
proc portuninstall::uninstall_main {args} {
global subport _inregistry_version _inregistry_revision _inregistry_variants user_options
<span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach {var backup} {_inregistry_version ::version _inregistry_revision ::revision _inregistry_variants ::portvariants} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach {var backup} {_inregistry_version version _inregistry_revision revision _inregistry_variants portvariants} {
</span> if {![info exists $var]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set $var [set $backup]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set $var [option $backup]
</span> }
}
registry_uninstall $subport $_inregistry_version $_inregistry_revision $_inregistry_variants [array get user_options]
</pre><pre style='margin:0'>
</pre>