extras-buildsys/utils/pushscript MultiLib.py,1.9,1.10

[Michael Schwendt (mschwendt)]

Author: mschwendt

Update of /cvs/fedora/extras-buildsys/utils/pushscript
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9822

Modified Files:
	MultiLib.py 
Log Message:
Apply black- and white-lists also to dependencies until Fedora multi-lib strategy is documented.


Index: MultiLib.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/MultiLib.py,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- MultiLib.py	24 Oct 2006 20:28:19 -0000	1.9
+++ MultiLib.py	20 Feb 2007 12:27:53 -0000	1.10
@@ -16,7 +16,7 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 import errno, os, sys
-import glob, pickle, re
+import glob, re
 import rpm, rpmUtils.arch, rpmUtils.transaction, rpmUtils.miscutils
 
 import Utils, RepoSupport
@@ -147,7 +147,7 @@
 # --------------------------------------------------------------------
 
 class Resolver(yum.YumBase):
-    def __init__(self, arch = None, config = "/etc/yum.conf"):
+    def __init__(self, arch, config, pushcfg, dist, targetarch):
         yum.YumBase.__init__(self)
 
         self.arch = arch
@@ -156,6 +156,10 @@
             self.repos.sqlite = False
             self.repos._selectSackType()
 
+        self.targetarch = targetarch
+        self.pushcfg = pushcfg
+        self.dist = dist
+        
         self.resolved = {}
         self.seenbefore = []
         self.needed = {}
@@ -213,6 +217,8 @@
 
             self.resolved[dep] = True
             for p in results:
+                if not isWantedName(self.pushcfg,self.dist,self.targetarch,[p.returnSimple('name')]):
+                    continue
                 self.addNeededPkg(p)
                 self.resolveRequires(p)
 
@@ -240,7 +246,8 @@
     print repoids
 
     # Only look at multicompat packages.
-    my = Resolver(arch = srcarch, config = conf)
+    my = Resolver(arch = srcarch, config = conf,
+                  pushcfg=cfg, dist=dist, targetarch=targetarch)
     os.remove(conf)
     for repo in my.repos.repos.values():
         if repo.id not in repoids: