[yum-cvs] yum/yum __init__.py,1.85,1.86

Seth Vidal skvidal at login.linux.duke.edu
Sat Feb 26 23:49:59 UTC 2005


Update of /home/groups/yum/cvs/yum/yum
In directory login:/tmp/cvs-serv31812/yum

Modified Files:
	__init__.py 
Log Message:

make exclusion of non-compat archs work for sqlite as well


Index: __init__.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/yum/__init__.py,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- __init__.py	25 Feb 2005 19:30:23 -0000	1.85
+++ __init__.py	26 Feb 2005 23:49:57 -0000	1.86
@@ -201,6 +201,7 @@
         self.repos.populateSack()
         self.pkgSack = self.repos.pkgSack
         self.excludePackages()
+        self.excludeNonCompatArchs(archlist=archlist)
         for repo in self.repos.listEnabled():
             self.excludePackages(repo)
             self.includePackages(repo)
@@ -337,13 +338,14 @@
             
         self.log(2, 'Finished')
         
-    def excludeNonCompatArchs(self):
+    def excludeNonCompatArchs(self, archlist=None):
         """runs through the whole packageSack and excludes any arch not compatible
            with the system"""
         
         self.log(2, 'Excluding Incompatible Archs')
-        archlist = ['src'] # source rpms are allowed
-        archlist.extend(rpmUtils.arch.getArchList())
+        if not archlist:
+            #archlist = ['src'] # source rpms are allowed
+            archlist.extend(rpmUtils.arch.getArchList())
         
         for po in self.pkgSack.returnPackages():
             if po.arch not in archlist:




More information about the Yum-cvs-commits mailing list