diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2009-06-15 11:03:39 +0200 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2009-06-15 11:03:39 +0200 |
| commit | f6415fe3135a1ae7d36a1f0f83fbdf597d789c0f (patch) | |
| tree | 49c4320b0e20a85749d7d05d3a536d4aec8c0c18 /utils | |
| parent | dce66068099a9fe24f6d0b9c017d0ddbf2be5b3e (diff) | |
| parent | c2ada55886cd33d7c4c41d3ac467aa5b0c6b4e69 (diff) | |
| download | python-apt-f6415fe3135a1ae7d36a1f0f83fbdf597d789c0f.tar.gz | |
merged from debian/unstable
Diffstat (limited to 'utils')
| -rwxr-xr-x | utils/get_debian_mirrors.py | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/utils/get_debian_mirrors.py b/utils/get_debian_mirrors.py index 2e3c7296..9fb783bd 100755 --- a/utils/get_debian_mirrors.py +++ b/utils/get_debian_mirrors.py @@ -5,7 +5,7 @@ # Download the latest list with available mirrors from the Debian # website and extract the hosts from the raw page # -# Copyright (c) 2006 Free Software Foundation Europe +# Copyright (c) 2006, 2009 Free Software Foundation Europe # # Author: Sebastian Heinlein <glatzor@ubuntu.com> # @@ -37,7 +37,8 @@ list_path = "../data/templates/Debian.mirrors" req = urllib2.Request("http://www.debian.org/mirror/mirrors_full") match = re.compile("^.*>([A-Za-z0-9-.\/_]+)<\/a>.*\n$") -match_location = re.compile('^<strong><a name="([A-Z]+)">.*') +match_location = re.compile('^<h3><a name="([A-Z]+)">.*') +match_sites = re.compile('^Site: <tt>([A-Za-z0-9-.\ \/_,]+)<\/tt>.*\n$') def add_sites(line, proto, sites, mirror_type): @@ -50,15 +51,15 @@ try: print "Downloading mirrors list from the Debian website..." uri=urllib2.urlopen(req) for line in uri.readlines(): - if line.startswith('<strong><a name="'): + if line.startswith('<h3><a name="'): location = match_location.sub(r"\1", line) if location: mirrors.append("#LOC:%s" % location) if line.startswith("Site:"): - sites = line[6:-1].split(",") - elif line.startswith('Packages over HTTP'): + sites = match_sites.sub(r"\1", line).split(",") + elif line.startswith('<br>Packages over HTTP'): add_sites(line, "http", sites, mirrors) - elif line.startswith('Packages over FTP'): + elif line.startswith('<br>Packages over FTP'): add_sites(line, "ftp", sites, mirrors) uri.close() except: |