<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository mpbb.
</pre>
<p><a href="https://github.com/macports/mpbb/commit/3a17fcd355bc88e66bff9262f42c91335d3c4b49">https://github.com/macports/mpbb/commit/3a17fcd355bc88e66bff9262f42c91335d3c4b49</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 3a17fcd dependencies.tcl: always try archivefetch
</span>3a17fcd is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 3a17fcd355bc88e66bff9262f42c91335d3c4b49
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Wed Jun 28 23:07:04 2023 +1000
<span style='display:block; white-space:pre;color:#404040;'> dependencies.tcl: always try archivefetch
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> The _archive_available check only looks at the public packages server.
</span><span style='display:block; white-space:pre;color:#404040;'> There may still be an archive in a private location.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes: https://trac.macports.org/ticket/67700
</span>---
tools/dependencies.tcl | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/tools/dependencies.tcl b/tools/dependencies.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 607537f..08c873a 100755
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/tools/dependencies.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/tools/dependencies.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -462,8 +462,7 @@ proc install_dep {ditem} {
</span> exit 1
}
} else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # No archive. This should be rare, but can happen in some
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # cases. Will build from source.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # No archive on the public server. May build from source.
</span>
# The known_fail case should normally be caught before now, but
# it's quick and easy to check and may save a build.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -474,6 +473,12 @@ proc install_dep {ditem} {
</span> exit 1
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Try archivefetch in case there's one available from e.g. ARCHIVE_SITE_LOCAL.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[catch {mportexec $ditem archivefetch} result]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ puts stderr $::errorInfo
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_error "Archivefetch failed: $result"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # Fetch and checksum the distfiles
if {[catch {mportexec $ditem fetch} result]} {
puts stderr $::errorInfo
</pre><pre style='margin:0'>
</pre>