<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/6d7682eec6d46eff5c5a4277bdc35cd3c8a2ca25">https://github.com/macports/macports-base/commit/6d7682eec6d46eff5c5a4277bdc35cd3c8a2ca25</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 6d7682eec6d46eff5c5a4277bdc35cd3c8a2ca25
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Wed May 14 23:56:32 2025 +1000
<span style='display:block; white-space:pre;color:#404040;'> _archive_available: use archive_sigtype if present
</span>---
src/port1.0/portutil.tcl | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/port1.0/portutil.tcl b/src/port1.0/portutil.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 20a588d30..04aea1f9a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/port1.0/portutil.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/port1.0/portutil.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3469,6 +3469,11 @@ proc _archive_available {} {
</span> return 0
}
set archivetype $portfetch::mirror_sites::archive_type($mirrors)
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[info exists portfetch::mirror_sites::archive_sigtype($mirrors)]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set sigtype $portfetch::mirror_sites::archive_sigtype($mirrors)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set sigtype rmd160
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> set archivename ${archiverootname}.${archivetype}
set sites_entries [list]
if {[info exists env(ARCHIVE_SITE_LOCAL)]} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3496,7 +3501,7 @@ proc _archive_available {} {
</span> # curl getsize can return -1 instead of throwing an error for
# nonexistent files on FTP sites.
if {![catch {curlwrap getsize $orig_site {} $url} size] && $size > 0
<span style='display:block; white-space:pre;background:#ffe0e0;'>- && ![catch {curlwrap getsize $orig_site {} ${url}.rmd160} sigsize] && $sigsize > 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ && ![catch {curlwrap getsize $orig_site {} ${url}.${sigtype}} sigsize] && $sigsize > 0} {
</span> set archive_available_result 1
return 1
}
</pre><pre style='margin:0'>
</pre>