diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2010-09-07 13:45:28 +0200 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2010-09-07 13:45:28 +0200 |
| commit | 0a6326c9776eec69eb6222f0d215aa42587c8a8a (patch) | |
| tree | 730dfbe4ae1dc88188ffcac744c7ec7af5e3e890 | |
| parent | 3aaf50270475e0a2a5fc8e7783e2f8917f8ac327 (diff) | |
| download | python-apt-0a6326c9776eec69eb6222f0d215aa42587c8a8a.tar.gz | |
cherry pick from debian-sid
| -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 |