<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/531720bba7af24204b507f26bdefbc60e58556c0">https://github.com/macports/macports-ports/commit/531720bba7af24204b507f26bdefbc60e58556c0</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 531720b  Travis: Prefer public archives over private ones
</span>531720b is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 531720bba7af24204b507f26bdefbc60e58556c0
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Tue Dec 4 05:55:06 2018 -0600

<span style='display:block; white-space:pre;color:#404040;'>    Travis: Prefer public archives over private ones
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    I had tried to do this with preferred_hosts before, but it appears to
</span><span style='display:block; white-space:pre;color:#404040;'>    have no effect on archive_site_local.
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    See: https://trac.macports.org/ticket/57720
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    Instead list both the public and the private URLs in archive_site_local.
</span><span style='display:block; white-space:pre;color:#404040;'>    They appear to be tried in the order listed.
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    But then we need to fix the base bug with multiple URLs in
</span><span style='display:block; white-space:pre;color:#404040;'>    archive_site_local:
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    See: https://trac.macports.org/ticket/57718
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    See: https://trac.macports.org/ticket/54800
</span><span style='display:block; white-space:pre;color:#404040;'>    See: https://github.com/macports/macports-ports/pull/3099
</span>---
 _ci/bootstrap.sh | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_ci/bootstrap.sh b/_ci/bootstrap.sh
</span><span style='display:block; white-space:pre;color:#808080;'>index f2f0c19..675f655 100755
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_ci/bootstrap.sh
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_ci/bootstrap.sh
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,13 +18,18 @@ sudo sed -i "" "s|rsync://rsync.macports.org/macports/release/tarballs/ports.tar
</span> echo "ui_interactive no" | sudo tee -a /opt/local/etc/macports/macports.conf >/dev/null
 # Only download from the CDN, not the mirrors
 echo "host_blacklist *.distfiles.macports.org *.packages.macports.org" | sudo tee -a /opt/local/etc/macports/macports.conf >/dev/null
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Also try downloading archives from the private server
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-echo "archive_site_local https://packages-private.macports.org/:tbz2" | sudo tee -a /opt/local/etc/macports/macports.conf >/dev/null
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Try downloading archives from the private server after trying the public server
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+echo "archive_site_local https://packages.macports.org/:tbz2 https://packages-private.macports.org/:tbz2" | sudo tee -a /opt/local/etc/macports/macports.conf >/dev/null
</span> # Prefer to get archives from the public server instead of the private server
<span style='display:block; white-space:pre;background:#ffe0e0;'>-echo "preferred_hosts packages.macports.org" | sudo tee -a /opt/local/etc/macports/macports.conf >/dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Fix bug in MacPorts 2.5.4 that makes archive_site_local not work
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# preferred_hosts has no effect on archive_site_local
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# See https://trac.macports.org/ticket/57720
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#echo "preferred_hosts packages.macports.org" | sudo tee -a /opt/local/etc/macports/macports.conf >/dev/null
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Fix bug in MacPorts 2.5.4 that makes archive_site_local not work at all
</span> # See https://trac.macports.org/ticket/57717
 sudo sed -E -i "" "s,{} ({} ARCHIVE_SITE_LOCAL),\1," /opt/local/libexec/macports/lib/package1.0/portarchivefetch.tcl
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Fix bug in MacPorts 2.5.4 that mishandles multiple URLs in archive_site_local
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# See https://trac.macports.org/ticket/57718
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+sudo sed -E -i "" 's,\[list (\$env\(\$senv\))\],\1,' /opt/local/libexec/macports/lib/port1.0/fetch_common.tcl
</span> # Update PortIndex
 rsync --no-motd -zvl "rsync://rsync.macports.org/macports/release/ports/PortIndex_darwin_${OS_MAJOR}_i386/PortIndex*" .
 git remote add macports https://github.com/macports/macports-ports.git
</pre><pre style='margin:0'>

</pre>