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

[James Antill]

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

New commits:
commit b4697ec87b62c00958059cc5119e762b050a3f2e
Author: James Antill <james at and.org>
Date:   Tue Jun 24 12:58:11 2008 -0400

    Allow noarch packages when in multilib_policy=best

diff --git a/yum/__init__.py b/yum/__init__.py
index 17f0664..bbf3df8 100644
--- a/yum/__init__.py
+++ b/yum/__init__.py
@@ -2198,8 +2198,10 @@ class YumBase(depsolve.Depsolve):
                            pkgs_by_name = {}
                            use = []
                            not_added = []
+                           best = rpmUtils.arch.legitMultiArchesInSameLib()
+                           best.append('noarch')
                            for pkg in pkgs:
-                               if pkg.arch in rpmUtils.arch.legitMultiArchesInSameLib():
+                               if pkg.arch in best:
                                    pkgs_by_name[pkg.name] = 1    
                                    use.append(pkg)  
                                else: