From 847208cf7a361d2ed6dc5f4f03184068690958d2 Mon Sep 17 00:00:00 2001 From: Ryan Schmidt Date: Tue, 27 Apr 2021 18:16:33 -0500 Subject: [PATCH] Don't add packages.macports.org to archive_site_local packages.macports.org is already in the default archive sites and each site in archive_site_local gets added to the list twice. Since packages.macports.org now has a lower pingtime than packages-private, MacPorts tries three times to download a nondistributable package from packages.macports.org without trying packages-private at all. See: https://trac.macports.org/ticket/57719 See: https://trac.macports.org/ticket/57720 See: https://lists.macports.org/pipermail/macports-dev/2021-April/043259.html --- .github/azure-workflows/bootstrap.sh | 4 ++-- .github/workflows/bootstrap.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/azure-workflows/bootstrap.sh b/.github/azure-workflows/bootstrap.sh index 513d529e65333..62c00cc4bc32c 100644 --- a/.github/azure-workflows/bootstrap.sh +++ b/.github/azure-workflows/bootstrap.sh @@ -77,8 +77,8 @@ sudo sed -i "" "s|rsync://rsync.macports.org/macports/release/tarballs/ports.tar 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 -# Try downloading archives from the private server after trying the public server -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 +# Also try downloading archives from the private server +echo "archive_site_local https://packages-private.macports.org/:tbz2" | sudo tee -a /opt/local/etc/macports/macports.conf >/dev/null # Prefer to get archives from the public server instead of the private server # preferred_hosts has no effect on archive_site_local # See https://trac.macports.org/ticket/57720 diff --git a/.github/workflows/bootstrap.sh b/.github/workflows/bootstrap.sh index 6f663e36356c5..9164033aa7cb9 100644 --- a/.github/workflows/bootstrap.sh +++ b/.github/workflows/bootstrap.sh @@ -77,8 +77,8 @@ sudo sed -i "" "s|rsync://rsync.macports.org/macports/release/tarballs/ports.tar 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 -# Try downloading archives from the private server after trying the public server -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 +# Also try downloading archives from the private server +echo "archive_site_local https://packages-private.macports.org/:tbz2" | sudo tee -a /opt/local/etc/macports/macports.conf >/dev/null # Prefer to get archives from the public server instead of the private server # preferred_hosts has no effect on archive_site_local # See https://trac.macports.org/ticket/57720