diff options
| -rw-r--r-- | apt/debfile.py | 1 | ||||
| -rw-r--r-- | debian/changelog | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/apt/debfile.py b/apt/debfile.py index eca07d14..7728ed21 100644 --- a/apt/debfile.py +++ b/apt/debfile.py @@ -599,6 +599,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 a1b060e6..bcab48a8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,10 @@ python-apt (0.7.97.2) UNRELEASED; urgency=low * apt/debfile: - don't fail if we conflict with the pkgs we are reinstalling + [ 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) UNRELEASED; urgency=low |