From b08e026fea9ed453d2cbaaa402fe1bd17c6242dd Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 19 Mar 2009 14:08:58 +0100 Subject: * aptsources/sourceslist.py: - fix bug in invalid lines detection (LP: #324614) --- aptsources/sourceslist.py | 2 +- debian/changelog | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/aptsources/sourceslist.py b/aptsources/sourceslist.py index f4d88822..29ee6430 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 9df26b05..3bbae45f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -19,6 +19,8 @@ python-apt (0.7.9~exp3) experimental; 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) -- -- cgit v1.2.3 From eef1614c216c646ccb35c73a518ac62a78457bd4 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 20 Mar 2009 23:07:39 +0100 Subject: close default timeout bug (thanks to juliank) --- debian/changelog | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index f996ef5b..901f3986 100644 --- a/debian/changelog +++ b/debian/changelog @@ -22,7 +22,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 -- cgit v1.2.3