<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/0c32a86609f495f69a47f5fb0d7a061e7c204e73">https://github.com/macports/macports-base/commit/0c32a86609f495f69a47f5fb0d7a061e7c204e73</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 0c32a86609f495f69a47f5fb0d7a061e7c204e73
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Tue May 20 14:41:42 2025 +1000
<span style='display:block; white-space:pre;color:#404040;'> Handle restored archive target in a few places
</span>---
src/macports1.0/macports.tcl | 9 ++++++---
1 file changed, 6 insertions(+), 3 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 d32d60f76..292b3989e 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;'>@@ -1958,8 +1958,8 @@ proc macports::worker_init {workername portpath porturl portbuildpath options va
</span>
# Tell the sub interpreter about commonly needed Tcl packages we
# already know about so it won't glob for packages.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach pkgName {port portactivate portarchivefetch portbuild portbump
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- portchecksum portclean portconfigure portdeactivate
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach pkgName {port portactivate portarchive portarchivefetch portbuild
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ portbump portchecksum portclean portconfigure portdeactivate
</span> portdepends portdestroot portdistcheck portdistfiles
portdmg portextract portfetch portimage portinstall
portlint portlivecheck portload portmain portmdmg
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2937,7 +2937,7 @@ proc mportexec {mport target} {
</span> set result [$workername eval [list eval_targets $target]]
# If auto-clean mode and successful install, clean-up after install
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {$result == 0 && $portautoclean && $target in {install activate}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {$result == 0 && $portautoclean && $target in {install activate archive}} {
</span> # Make sure we are back in the port path, just in case
set portpath [ditem_key $mport portpath]
catch {cd $portpath}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4488,6 +4488,7 @@ proc macports::_target_needs_deps {target} {
</span> destroot -
install -
activate -
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ archive -
</span> dmg -
mdmg -
pkg -
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4519,6 +4520,7 @@ proc macports::_target_needs_toolchain {workername target} {
</span>
install -
activate -
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ archive -
</span> dmg -
mdmg -
pkg -
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4558,6 +4560,7 @@ proc macports::_deptypes_for_target {target workername} {
</span> }
install -
activate -
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ archive -
</span> {} {
if {[global_option_isset ports_binary_only] ||
[$workername eval {registry_exists $subport $version $revision $portvariants}]
</pre><pre style='margin:0'>
</pre>