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

[skvidal at osuosl.org]

 rpmUtils/arch.py |   10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

New commits:
commit 267bf224380f6dbd20bbe99704beb21575acc91a
Author: Seth Vidal <skvidal at fedoraproject.org>
Date:   Wed Jul 7 11:38:17 2010 -0400

    add archlist_includes_compat option to ArchStorage.setup_arch
    
    this allows us to prune out the non-main arch level if we just want to look
    at x86_64 only. It's a shorthand for pruning out all the other compat archs (i686, i586, etc)

diff --git a/rpmUtils/arch.py b/rpmUtils/arch.py
index b334750..6a1404d 100644
--- a/rpmUtils/arch.py
+++ b/rpmUtils/arch.py
@@ -397,7 +397,7 @@ class ArchStorage(object):
         self.multilib = False
         self.setup_arch()
 
-    def setup_arch(self, arch=None):
+    def setup_arch(self, arch=None, archlist_includes_compat_arch=True):
         if arch:
             self.canonarch = arch
         else:
@@ -405,6 +405,14 @@ class ArchStorage(object):
         
         self.basearch = getBaseArch(myarch=self.canonarch)
         self.archlist = getArchList(thisarch=self.canonarch)
+        
+        if not archlist_includes_compat: # - do we bother including i686 and below on x86_64
+            limit_archlist = []
+            for a in self.archlist:
+                if isMultiLibArch(a) or a == 'noarch':
+                    limit_archlist.append(a)
+            self.archlist = limit_archlist
+            
         self.bestarch = getBestArch(myarch=self.canonarch)
         self.compatarches = getMultiArchInfo(arch=self.canonarch)
         self.multilib = isMultiLibArch(arch=self.canonarch)