diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2010-09-07 11:52:42 +0200 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2010-09-07 11:52:42 +0200 |
| commit | ab8da1ea6e1a965b819243045bfd50c8e1843366 (patch) | |
| tree | 989152f7947bf2b7de0090f98c2d274f1b68dedb | |
| parent | 6809becd9c7dccc797dde7be2046cad55712c5de (diff) | |
| download | python-apt-ab8da1ea6e1a965b819243045bfd50c8e1843366.tar.gz | |
merged from lp:~kiwinote/python-apt/reinstall-same-file
| -rw-r--r-- | apt/debfile.py | 3 | ||||
| -rw-r--r-- | debian/changelog | 8 |
2 files changed, 10 insertions, 1 deletions
diff --git a/apt/debfile.py b/apt/debfile.py index 1e7a66cc..eca07d14 100644 --- a/apt/debfile.py +++ b/apt/debfile.py @@ -347,7 +347,8 @@ class DebPackage(object): 'targetver' : c_or.target_ver } self._cache.op_progress.done() return False - if c_or.target_pkg.name in provides: + if (c_or.target_pkg.name in provides and + self.pkgname != pkg.name): self._dbg(2, "would break (conflicts) %s" % provides) self._failure_string += _("Breaks existing package '%(pkgname)s' that conflict: '%(targetpkg)s'. But the '%(debfile)s' provides it via: '%(provides)s'") % { 'provides' : ",".join(provides), diff --git a/debian/changelog b/debian/changelog index 7d5aced1..a1b060e6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +python-apt (0.7.97.2) UNRELEASED; urgency=low + + [ Kiwinote ] + * apt/debfile: + - don't fail if we conflict with the pkgs we are reinstalling + + -- Michael Vogt <mvo@debian.org> Fri, 27 Aug 2010 11:22:23 +0200 + python-apt (0.7.97) UNRELEASED; urgency=low [ Julian Andres Klode ] |