diff options
| author | Julian Andres Klode <jak@debian.org> | 2009-04-01 15:37:11 +0200 |
|---|---|---|
| committer | Julian Andres Klode <jak@debian.org> | 2009-04-01 15:37:11 +0200 |
| commit | 81e4a912986f2e95deab42f602a0c8ac5782fa8f (patch) | |
| tree | 150b41f911b68dd7fb760a5e06d14f63475161b9 | |
| parent | 3fbbced1f6d22d6ce3a7188032b0d19251159fbd (diff) | |
| parent | c884ff15493617480ac2fa5a4bbbd75cce3f9a51 (diff) | |
| download | python-apt-81e4a912986f2e95deab42f602a0c8ac5782fa8f.tar.gz | |
Merge with debian-sid
original value (in getChangelog(), LP: #314212)
Closes: #513315
* aptsources/sourceslist.py:
- fix bug in invalid lines detection (LP: #324614)
| -rw-r--r-- | aptsources/sourceslist.py | 2 | ||||
| -rw-r--r-- | debian/changelog | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/aptsources/sourceslist.py b/aptsources/sourceslist.py index 950bbd62..b1f00446 100644 --- a/aptsources/sourceslist.py +++ b/aptsources/sourceslist.py @@ -144,7 +144,7 @@ class SourceEntry: return if line[0] == "#": self.disabled = True - pieces = line[1:].strip() + pieces = line[1:].strip().split() # if it looks not like a disabled deb line return if not pieces[0] in ("rpm", "rpm-src", "deb", "deb-src"): self.invalid = True diff --git a/debian/changelog b/debian/changelog index 0015319c..3dc359c7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -31,7 +31,8 @@ python-apt (0.7.9) unstable; urgency=low - add Recommends to iso-codes (for iso_3166.xml) * apt/package.py: - make sure to set the defaulttimeout back to the - original value (in getChangelog(), LP: #314212) + original value (in getChangelog(), LP: #314212) + Closes: #513315 * apt/cache.py: - when setting a alternative rootdir, read the config from it as well @@ -43,6 +44,8 @@ python-apt (0.7.9) unstable; urgency=low closes: #497049 * apt/package.py: - avoid uneeded interal references in the Package objects + * aptsources/sourceslist.py: + - fix bug in invalid lines detection (LP: #324614) -- Michael Vogt <mvo@debian.org> Thu, 19 Mar 2009 13:39:21 +0100 |