summaryrefslogtreecommitdiff
path: root/apt
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2010-09-07 11:56:17 +0200
committerMichael Vogt <michael.vogt@ubuntu.com>2010-09-07 11:56:17 +0200
commitbc301a8f07e50c7a14973b10fa4cb95f7a2beff2 (patch)
tree62e879ff5ec546990e5d9e434ea5f35232eaf8d0 /apt
parent92246a6af0ef54b3cb49a7448ad972e4f1b2186c (diff)
downloadpython-apt-bc301a8f07e50c7a14973b10fa4cb95f7a2beff2.tar.gz
* apt/debfile:
- don't fail if we conflict with the pkgs we are reinstalling
Diffstat (limited to 'apt')
-rw-r--r--apt/debfile.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/apt/debfile.py b/apt/debfile.py
index f4a31379..d8159546 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),