[yum-commits] Branch 'yum-3_2_X' - yum/__init__.py

[James Antill]

 yum/__init__.py |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 5045679353b60d05768bb05479e561b93706f48e
Author: James Antill <james at and.org>
Date:   Thu Jan 6 10:25:43 2011 -0500

    Fix protected_multilib for kernel/etc.

diff --git a/yum/__init__.py b/yum/__init__.py
index fcf5076..6bb1614 100644
--- a/yum/__init__.py
+++ b/yum/__init__.py
@@ -979,6 +979,9 @@ class YumBase(depsolve.Depsolve):
             txmbrs = self.tsInfo.getMembersWithState(None, TS_INSTALL_STATES)
         vers = {}
         for txmbr in txmbrs:
+            if self.allowedMultipleInstalls(txmbr.po):
+                continue # Just allow these, it's easier.
+
             #  In theory we could skip noarch packages here, but it's really
             # fast and there are some edge cases where it'll help.
             if txmbr.name not in vers:
@@ -997,7 +1000,8 @@ class YumBase(depsolve.Depsolve):
                         continue
                     vers[pkgname].append(pkg)
 
-            # If all the versions are equal, we should be fine.
+            #  If we have multiple packages, they should be of different arches
+            # and so if all the versions are equal, we should be fine.
             first = vers[pkgname][0]
             for other in vers[pkgname][1:]:
                 if first.verEQ(other):