<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/2044584dd7928370f976ad7c88fea8055687b5ab">https://github.com/macports/macports-base/commit/2044584dd7928370f976ad7c88fea8055687b5ab</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 2044584d registry::run_target: pass in version info
</span>2044584d is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 2044584dd7928370f976ad7c88fea8055687b5ab
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Fri Jan 29 04:37:00 2021 +1100
<span style='display:block; white-space:pre;color:#404040;'> registry::run_target: pass in version info
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> This avoids the possibility that the registry's idea of the port's
</span><span style='display:block; white-space:pre;color:#404040;'> version,revision,variants doesn't match the Portfile's. That could
</span><span style='display:block; white-space:pre;color:#404040;'> happen when rules for when to define a universal variant changed, for
</span><span style='display:block; white-space:pre;color:#404040;'> example 098ce7c, ff88702.
</span>---
src/port1.0/portactivate.tcl | 9 +++++++--
src/port1.0/portdeactivate.tcl | 9 +++++++--
src/port1.0/portuninstall.tcl | 9 +++++++--
src/registry2.0/registry_util.tcl | 1 +
4 files changed, 22 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 135874e5..db157464 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;'>@@ -59,7 +59,12 @@ proc portactivate::activate_start {args} {
</span> }
proc portactivate::activate_main {args} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- global subport version revision portvariants prefix user_options
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ global subport _inregistry_version _inregistry_revision _inregistry_variants prefix user_options
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach {var backup} {_inregistry_version ::version _inregistry_revision ::revision _inregistry_variants ::portvariants} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![info exists $var]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set $var [set $backup]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span>
set optionlist [array get user_options]
set renames {}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -72,7 +77,7 @@ proc portactivate::activate_main {args} {
</span> }
lappend optionlist portactivate_rename_files $renames
<span style='display:block; white-space:pre;background:#ffe0e0;'>- registry_activate $subport $version $revision $portvariants $optionlist
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ registry_activate $subport $_inregistry_version $_inregistry_revision $_inregistry_variants $optionlist
</span>
return 0
}
<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 00c682fe..7ab81bca 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;'>@@ -56,7 +56,12 @@ proc portdeactivate::deactivate_start {args} {
</span> }
proc portdeactivate::deactivate_main {args} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- global subport version revision portvariants user_options
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ global subport _inregistry_version _inregistry_revision _inregistry_variants user_options
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach {var backup} {_inregistry_version ::version _inregistry_revision ::revision _inregistry_variants ::portvariants} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![info exists $var]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set $var [set $backup]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span>
if {[portstartupitem::loaded] ne ""} {
if {[eval_targets "unload"]} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -64,6 +69,6 @@ proc portdeactivate::deactivate_main {args} {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- registry_deactivate $subport $version $revision $portvariants [array get user_options]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ registry_deactivate $subport $_inregistry_version $_inregistry_revision $_inregistry_variants [array get user_options]
</span> return 0
}
<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 1b07db9d..f0ed7850 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;'>@@ -56,7 +56,12 @@ proc portuninstall::uninstall_start {args} {
</span> }
proc portuninstall::uninstall_main {args} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- global subport version revision portvariants user_options
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- registry_uninstall $subport $version $revision $portvariants [array get user_options]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ global subport _inregistry_version _inregistry_revision _inregistry_variants user_options
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach {var backup} {_inregistry_version ::version _inregistry_revision ::revision _inregistry_variants ::portvariants} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![info exists $var]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set $var [set $backup]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ registry_uninstall $subport $_inregistry_version $_inregistry_revision $_inregistry_variants [array get user_options]
</span> return 0
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/registry2.0/registry_util.tcl b/src/registry2.0/registry_util.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 5aca79c7..d5ec6a63 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/registry2.0/registry_util.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/registry2.0/registry_util.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -114,6 +114,7 @@ proc run_target {port target options} {
</span> ui_debug "no portfile in registry for $portspec"
return 0
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend options _inregistry_version [$port version] _inregistry_revision [$port revision] _inregistry_variants [$port variants]
</span>
if {![catch {set mport [mportopen_installed [$port name] [$port version] [$port revision] [$port variants] $options]}]} {
if {[catch {set result [mportexec $mport $target]} result] || $result != 0} {
</pre><pre style='margin:0'>
</pre>