Merge lp:~feldgendler/python-apt/829138 into lp:ubuntu/precise/python-apt

[Alexey Feldgendler]

Fixes LP #829138 by requiring a matching architecture when checking for conflicts.

[Michael Vogt (mvo)]

Thanks! That looks great!

review: Approve

[Michael Vogt (mvo)]

This is part of the python-apt upload in ubuntu 12.04 (precise) now. Thanks again for the fix!

=== modified file 'apt/debfile.py'
--- apt/debfile.py	2011-05-24 10:08:56 +0000
+++ apt/debfile.py	2011-12-07 16:50:33 +0000
@@ -308,6 +308,7 @@
         size = float(len(self._cache))
         steps = max(int(size/50), 1)
         debver = self._sections["Version"]
+        debarch = self._sections["Architecture"]
         # store what we provide so that we can later check against that
         provides = [ x[0][0] for x in self.provides]
         for (i, pkg) in enumerate(self._cache):
@@ -336,7 +337,7 @@
             if "Conflicts" in ver.depends_list:
                 for conflicts_ver_list in ver.depends_list["Conflicts"]:
                     for c_or in conflicts_ver_list:
-                        if c_or.target_pkg.name == self.pkgname:
+                        if c_or.target_pkg.name == self.pkgname and c_or.target_pkg.architecture == debarch:
                             if apt_pkg.check_dep(debver, c_or.comp_type, c_or.target_ver):
                                 self._dbg(2, "would break (conflicts) %s" % pkg.name)
 				# TRANSLATORS: the first '%s' is the package that conflicts, the second the packagename that it conflicts with (so the name of the deb the user tries to install), the third is the relation (e.g. >=) and the last is the version for the relation