summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2011-08-11 15:31:22 +0200
committerMichael Vogt <michael.vogt@ubuntu.com>2011-08-11 15:31:22 +0200
commiteb4f978ff50af015c0cda09f51934b48249744ea (patch)
treee1cad975ca2fc3c0e889d82a5711b7052a46478d
parent4cf6c707ad028c8185e6df30c256f72032bbf8f4 (diff)
downloadpython-apt-eb4f978ff50af015c0cda09f51934b48249744ea.tar.gz
* aptsources/distinfo.py:
- make mirror a valid protocol name
-rw-r--r--aptsources/distinfo.py2
-rw-r--r--debian/changelog2
2 files changed, 3 insertions, 1 deletions
diff --git a/aptsources/distinfo.py b/aptsources/distinfo.py
index 48a72719..ac4a4b40 100644
--- a/aptsources/distinfo.py
+++ b/aptsources/distinfo.py
@@ -158,7 +158,7 @@ class DistInfo(object):
location = None
match_loc = re.compile(r"^#LOC:(.+)$")
match_mirror_line = re.compile(
- r"^(#LOC:.+)|(((http)|(ftp)|(rsync)|(file)|(https))://"
+ r"^(#LOC:.+)|(((http)|(ftp)|(rsync)|(file)|(mirror)|(https))://"
r"[A-Za-z0-9/\.:\-_@]+)$")
#match_mirror_line = re.compile(r".+")
diff --git a/debian/changelog b/debian/changelog
index 249f4d17..242e4058 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,6 +18,8 @@ python-apt (0.8.1) UNRELEASED; urgency=low
PPA buildds)
* tests/test_all.py:
- print library dir to hunt down build failure on amd64
+ * aptsources/distinfo.py:
+ - make mirror a valid protocol name
-- Julian Andres Klode <jak@debian.org> Tue, 07 Jun 2011 14:00:22 +0200