diff options
| author | Julian Andres Klode <jak@debian.org> | 2009-01-10 00:28:17 +0100 |
|---|---|---|
| committer | Julian Andres Klode <jak@debian.org> | 2009-01-10 00:28:17 +0100 |
| commit | f9ab7e8cba34b547b3295409bc70a3b41da76e7c (patch) | |
| tree | d2b16a5c1ccf3ec91d29d2b2551ac10055860e21 | |
| parent | 2470a03e9789f1729a49d945e8719b2adba871f8 (diff) | |
| download | python-apt-f9ab7e8cba34b547b3295409bc70a3b41da76e7c.tar.gz | |
* aptsources/distinfo.py: Allow @ in mirror urls (Closes: #478171)
| -rw-r--r-- | aptsources/distinfo.py | 2 | ||||
| -rw-r--r-- | debian/changelog | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/aptsources/distinfo.py b/aptsources/distinfo.py index 42395bc5..7a318799 100644 --- a/aptsources/distinfo.py +++ b/aptsources/distinfo.py @@ -132,7 +132,7 @@ class DistInfo: location = None match_loc = re.compile(r"^#LOC:(.+)$") - match_mirror_line = re.compile(r"^(#LOC:.+)|(((http)|(ftp)|(rsync)|(file)|(https))://[A-Za-z/\.:\-_]+)$") + match_mirror_line = re.compile(r"^(#LOC:.+)|(((http)|(ftp)|(rsync)|(file)|(https))://[A-Za-z/\.:\-_@]+)$") #match_mirror_line = re.compile(r".+") if not dist: diff --git a/debian/changelog b/debian/changelog index 0bd352b0..0324ae09 100644 --- a/debian/changelog +++ b/debian/changelog @@ -25,8 +25,10 @@ python-apt (0.7.9~exp2) experimental; urgency=low - Remove the Conflicts on python2.3-apt, python2.4-apt, as they are only needed for oldstable (sarge) - Build-Depend on python-sphinx (>= 0.5) + * aptsources/distinfo.py: + - Allow @ in mirror urls (Closes: #478171) - -- Julian Andres Klode <jak@debian.org> Fri, 09 Jan 2009 18:11:30 +0100 + -- Julian Andres Klode <jak@debian.org> Sat, 10 Jan 2009 00:26:57 +0100 python-apt (0.7.9~exp1) experimental; urgency=low |