summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Heinlein <sebi@sebi-laptop>2007-04-04 11:32:24 +0200
committerSebastian Heinlein <sebi@sebi-laptop>2007-04-04 11:32:24 +0200
commitc9827eb8959b4514e122807257585efd6334cb9c (patch)
treef30cc044c44ef2c0ca2fa8d48545de30d54cef88
parent21b5735a807882789c3734694f5def88deb35cb3 (diff)
downloadpython-apt-c9827eb8959b4514e122807257585efd6334cb9c.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.py8
-rw-r--r--debian/changelog7
2 files changed, 14 insertions, 1 deletions
diff --git a/aptsources/sourceslist.py b/aptsources/sourceslist.py
index a10d5b68..16784ec4 100644
--- a/aptsources/sourceslist.py
+++ b/aptsources/sourceslist.py
@@ -248,12 +248,18 @@ 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
+ # FIXME: perhaps could be done in a prittier way
+ comps = []
+ for c in orig_comps:
+ comps.append(c)
# 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 2d40777f..b5c54084 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+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 <sebi@sebi-laptop> Wed, 4 Apr 2007 11:31:33 +0200
+
python-apt (0.6.20ubuntu15) unstable; urgency=low
[ Sebastian Heinlein ]