<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/c80d8398f12f2609694f5c3c66fc6224318a5806">https://github.com/macports/macports-base/commit/c80d8398f12f2609694f5c3c66fc6224318a5806</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit c80d8398f12f2609694f5c3c66fc6224318a5806
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Mon Mar 4 07:24:51 2024 +1100
<span style='display:block; white-space:pre;color:#404040;'> Avoid side effect from loading portmain
</span>---
src/macports1.0/macports.tcl | 1 +
src/port1.0/portmain.tcl | 4 ----
2 files changed, 1 insertion(+), 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 1c25900b7..c68f9756e 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;'>@@ -1725,6 +1725,7 @@ proc macports::worker_init {workername portpath porturl portbuildpath options va
</span> # Create package require abstraction procedure
$workername eval [list proc PortSystem {version} {
package require port $version
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ portmain::report_platform_info
</span> }]
# Clearly separate slave interpreters and the master interpreter.
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/port1.0/portmain.tcl b/src/port1.0/portmain.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index c12ece2e7..76f9e119e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/port1.0/portmain.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/port1.0/portmain.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -142,16 +142,12 @@ default os.endian {$os_endian}
</span>
proc portmain::report_platform_info {} {
global os.platform os.version os.arch macos_version
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {![info exists os.platform]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> set macos_version_text {}
if {${os.platform} eq "darwin"} {
set macos_version_text "(macOS ${macos_version}) "
}
ui_debug "OS ${os.platform}/${os.version} ${macos_version_text}arch ${os.arch}"
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-portmain::report_platform_info
</span>
default universal_variant {${use_configure}}
</pre><pre style='margin:0'>
</pre>