<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/b73f14a4acdec705ae64464e27e2e7f9e3ee5645">https://github.com/macports/macports-base/commit/b73f14a4acdec705ae64464e27e2e7f9e3ee5645</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 b73f14a4a Don't try to fetch sig from sites missing archive
</span>b73f14a4a is described below

<span style='display:block; white-space:pre;color:#808000;'>commit b73f14a4acdec705ae64464e27e2e7f9e3ee5645
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Thu Nov 16 12:54:56 2023 +1100

<span style='display:block; white-space:pre;color:#404040;'>    Don't try to fetch sig from sites missing archive
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    This would only be useful in the extremely unusual case that no site
</span><span style='display:block; white-space:pre;color:#404040;'>    has both the signature and the archive, but each is available on some
</span><span style='display:block; white-space:pre;color:#404040;'>    site by itself. It just causes unnecessary http requests in the common
</span><span style='display:block; white-space:pre;color:#404040;'>    case.
</span>---
 src/package1.0/portarchivefetch.tcl | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/package1.0/portarchivefetch.tcl b/src/package1.0/portarchivefetch.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index ecfa54fdf..5f355d9f7 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/package1.0/portarchivefetch.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/package1.0/portarchivefetch.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -242,11 +242,11 @@ proc portarchivefetch::fetchfiles {args} {
</span>                         set archive_fetched 1
                     } trap {POSIX SIG SIGINT} {_ eOptions} {
                         ui_debug [msgcat::mc "Aborted fetching archive due to SIGINT"]
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                        file delete -force ${incoming_path}/${archive}.TMP $signature
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        file delete -force ${incoming_path}/${archive}.TMP
</span>                         throw [dict get $eOptions -errorcode] [dict get $eOptions -errorinfo]
                     } trap {POSIX SIG SIGTERM} {_ eOptions} {
                         ui_debug [msgcat::mc "Aborted fetching archive due to SIGTERM"]
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                        file delete -force ${incoming_path}/${archive}.TMP $signature
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        file delete -force ${incoming_path}/${archive}.TMP
</span>                         throw [dict get $eOptions -errorcode] [dict get $eOptions -errorinfo]
                     } on error {eMessage} {
                         ui_debug [msgcat::mc "Fetching archive failed: %s" $eMessage]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -259,11 +259,12 @@ proc portarchivefetch::fetchfiles {args} {
</span>                     }
                 }
                 # fetch signature
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                if {!$sig_fetched} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                if {$archive_fetched} {
</span>                     ui_msg "$UI_PREFIX [format [msgcat::mc "Attempting to fetch %s from %s"] ${archive}.rmd160 $site]"
                     try {
                         curl fetch {*}$fetch_options ${file_url}.rmd160 $signature
                         set sig_fetched 1
<span style='display:block; white-space:pre;background:#e0ffe0;'>+                        break
</span>                     } trap {POSIX SIG SIGINT} {_ eOptions} {
                         ui_debug [msgcat::mc "Aborted fetching archive due to SIGINT"]
                         file delete -force ${incoming_path}/${archive}.TMP $signature
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -278,9 +279,6 @@ proc portarchivefetch::fetchfiles {args} {
</span>                         file delete -force $signature
                     }
                 }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                if {$archive_fetched && $sig_fetched} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    break
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                }
</span>             }
             if {$archive_fetched && $sig_fetched} {
                 set openssl [findBinary openssl $portutil::autoconf::openssl_path]
</pre><pre style='margin:0'>

</pre>