diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2007-04-25 16:12:29 +0200 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2007-04-25 16:12:29 +0200 |
| commit | c158927f8fe509704b3e1096fb17b1308a197c8c (patch) | |
| tree | 8c4c0f5c7bf1b9565ddc4e219000d3fb71a2d410 | |
| parent | 520c5e2ea5b839286fe6e1f0783727fe0e692eed (diff) | |
| parent | c43a7c898cdb5cdd40603999334e2981eae00ecc (diff) | |
| download | python-apt-c158927f8fe509704b3e1096fb17b1308a197c8c.tar.gz | |
* Fix the addition of of sources that are already enabled but not with
all components - fix LP#98795
| -rw-r--r-- | aptsources/sourceslist.py | 6 | ||||
| -rw-r--r-- | debian/changelog | 9 |
2 files changed, 13 insertions, 2 deletions
diff --git a/aptsources/sourceslist.py b/aptsources/sourceslist.py index a10d5b68..270b8489 100644 --- a/aptsources/sourceslist.py +++ b/aptsources/sourceslist.py @@ -248,12 +248,16 @@ class SourcesList: yield entry raise StopIteration - def add(self, type, uri, dist, comps, comment="", pos=-1, file=None): + def add(self, type, uri, dist, orig_comps, comment="", pos=-1, file=None): """ Add a new source to the sources.list. The method will search for existing matching repos and will try to reuse them as far as possible """ + + # create a working copy of the component list so that + # we can modify it later + comps = orig_comps[:] # check if we have this source already in the sources.list for source in self.list: if source.disabled == False and source.invalid == False and \ diff --git a/debian/changelog b/debian/changelog index e92c91cf..98c56ec3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,11 @@ -python-apt (0.6.20ubuntu15) feisty; urgency=low +python-apt (0.6.20ubuntu16) feisty; urgency=low + + * Fix the addition of of sources that are already enabled but not with + all components - fix LP#98795 + + -- Sebastian Heinlein <glatzor@ubuntu.com> Wed, 4 Apr 2007 11:31:33 +0200 + +python-apt (0.6.20ubuntu15) unstable; urgency=low [ Sebastian Heinlein ] * Update the mirror lists from Launchpad |
