This commit is contained in:
Steve Langasek 2023-05-30 19:37:11 -07:00
parent a000e9db5e
commit 89e788bf48
3 changed files with 9 additions and 2 deletions

7
debian/changelog vendored
View File

@ -1,3 +1,10 @@
ubuntu-dev-tools (0.193ubuntu5) UNRELEASED; urgency=medium
* Remove references to deprecated
http://people.canonical.com/~ubuntu-archive.
-- Steve Langasek <steve.langasek@ubuntu.com> Tue, 30 May 2023 19:35:57 -0700
ubuntu-dev-tools (0.193ubuntu4) mantic; urgency=medium
* Remove references to ftpmaster.internal. When this name is resolvable

View File

@ -452,7 +452,7 @@ def is_blacklisted(query):
blacklisted = "ALWAYS"
# Old blacklist:
url = "http://people.canonical.com/~ubuntu-archive/sync-blacklist.txt"
url = "https://ubuntu-archive-team.ubuntu.com/sync-blacklist.txt"
with urllib.request.urlopen(url) as f:
applicable_lines = []
for line in f:

View File

@ -946,7 +946,7 @@ class _WebJSON:
class Madison(_WebJSON):
urls = {
"debian": "https://api.ftp-master.debian.org/madison",
"ubuntu": "http://people.canonical.com/~ubuntu-archive/madison.cgi",
"ubuntu": "https://ubuntu-archive-team.ubuntu.com/madison.cgi",
}
def __init__(self, distro="debian"):