summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2010-08-27 11:22:47 +0200
committerMichael Vogt <michael.vogt@ubuntu.com>2010-08-27 11:22:47 +0200
commit8cd715add7f85fb67cc30e42449d83a2ef7cf0bd (patch)
tree50709e989a8520df83161b1c94d13bf318273cba
parent1da80475cabf37da411aff8983d427773cfc0a80 (diff)
downloadpython-apt-8cd715add7f85fb67cc30e42449d83a2ef7cf0bd.tar.gz
* apt/debfile.py:
- add missing init for _installed_conflicts (LP: #618597)
-rw-r--r--apt/debfile.py1
-rw-r--r--debian/changelog8
2 files changed, 9 insertions, 0 deletions
diff --git a/apt/debfile.py b/apt/debfile.py
index 33f0f04d..9bf27da3 100644
--- a/apt/debfile.py
+++ b/apt/debfile.py
@@ -598,6 +598,7 @@ class DscSrcPackage(DebPackage):
self.filename = filename
self._depends = []
self._conflicts = []
+ self._installed_conflicts = set()
self.pkgname = ""
self.binaries = []
if self.filename is not None:
diff --git a/debian/changelog b/debian/changelog
index 1c9598fb..6f3ea91e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+python-apt (0.7.97.2) UNRELEASED; urgency=low
+
+ [ Michael Vogt ]
+ * apt/debfile.py:
+ - add missing init for _installed_conflicts (LP: #618597)
+
+ -- Michael Vogt <mvo@debian.org> Fri, 27 Aug 2010 11:22:23 +0200
+
python-apt (0.7.97.1) unstable; urgency=low
* tests/test_apt_cache.py: