<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/2a32cd5c3ae8fa49a2d873a5da1d5aeead442720">https://github.com/macports/macports-base/commit/2a32cd5c3ae8fa49a2d873a5da1d5aeead442720</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 2a32cd5c3ae8fa49a2d873a5da1d5aeead442720
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Tue Mar 5 18:16:36 2024 +1100
<span style='display:block; white-space:pre;color:#404040;'> Remove registry_open flag
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> The portimage procs should no longer be called from any interpreters
</span><span style='display:block; white-space:pre;color:#404040;'> that haven't called mportinit.
</span>---
src/macports1.0/macports.tcl | 4 +---
src/registry2.0/portimage.tcl | 8 --------
2 files changed, 1 insertion(+), 11 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 c68f9756e..3fd63e1f4 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;'>@@ -1633,9 +1633,7 @@ match macports.conf.default."
</span> set db_path [file join ${registry.path} registry registry.db]
set db_exists [file exists $db_path]
registry::open $db_path
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # for the benefit of the portimage code that is called from multiple interpreters
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- global registry_open
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set registry_open yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # convert any flat receipts if we just created a new db
if {$db_exists == 0 && [file exists ${registry.path}/receipts] && [file writable $db_path]} {
ui_warn "Converting your registry to sqlite format, this might take a while..."
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/registry2.0/portimage.tcl b/src/registry2.0/portimage.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 641ebae62..54b3dd776 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/registry2.0/portimage.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/registry2.0/portimage.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -90,10 +90,6 @@ proc activate {name {version ""} {revision ""} {variants 0} {options ""}} {
</span> if {[dict exists $options portactivate_rename_files]} {
set rename_list [dict get $options portactivate_rename_files]
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {![info exists ::registry_open]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- registry::open [::file join ${::macports::registry.path} registry registry.db]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set ::registry_open yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> set todeactivate [list]
registry::read {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -173,10 +169,6 @@ proc deactivate {name {version ""} {revision ""} {variants 0} {options ""}} {
</span> } else {
set force 0
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {![info exists ::registry_open]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- registry::open [::file join ${::macports::registry.path} registry registry.db]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set ::registry_open yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span>
if {$name eq ""} {
throw registry::image-error "Registry error: Please specify the name of the port."
</pre><pre style='margin:0'>
</pre>