diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2011-08-11 15:32:00 +0200 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2011-08-11 15:32:00 +0200 |
| commit | 9e29655649ca1113a82990beba3f2a1f1f0564aa (patch) | |
| tree | 8fcb09e515b34571c94c5e2df3ed8e199ef0ea01 | |
| parent | 2cfb0428661b717546f91c625c5e6aa7a5864459 (diff) | |
| parent | eb4f978ff50af015c0cda09f51934b48249744ea (diff) | |
| download | python-apt-9e29655649ca1113a82990beba3f2a1f1f0564aa.tar.gz | |
* aptsources/distinfo.py:
- make mirror a valid protocol name
| -rw-r--r-- | aptsources/distinfo.py | 2 | ||||
| -rw-r--r-- | debian/changelog | 7 |
2 files changed, 8 insertions, 1 deletions
diff --git a/aptsources/distinfo.py b/aptsources/distinfo.py index 249985e7..dbd28939 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 2ef16e90..354c13d6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +python-apt (0.8.0ubuntu7) UNRELEASED; urgency=low + + * aptsources/distinfo.py: + - make mirror a valid protocol name + + -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 11 Aug 2011 15:31:55 +0200 + python-apt (0.8.0ubuntu6) oneiric; urgency=low * debian/control: |