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

[Michael Schwendt (mschwendt)]

Author: mschwendt

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

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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- MultiLib.py	20 Feb 2007 12:27:53 -0000	1.10
+++ MultiLib.py	20 Feb 2007 12:36:23 -0000	1.11
@@ -41,15 +41,24 @@
 missingdict = {}
 
 
+def isRejectedName(cfg,dist,targetarch,name):
+    """Check a single package name against black-list.
+    Returns: True or False"""
+    if cfg.multiblacklists.has_key(dist) and cfg.multiblacklists[dist].has_key(targetarch):
+        for r in cfg.multiblacklists[dist][targetarch]:
+            if re.compile('^'+r+'$').search(name):
+                return True
+    return False # accept by default
+
+
 def isWantedName(cfg,dist,targetarch,namelist):
     """Check a single package name against black-list and white-list. Since
     a package can have virtual names, this takes a list of names as input.
+    Black-list overrides white-list.
     Returns: True or False"""
     for n in namelist:
-        if cfg.multiblacklists.has_key(dist) and cfg.multiblacklists[dist].has_key(targetarch):
-            for r in cfg.multiblacklists[dist][targetarch]:
-                if re.compile('^'+r+'$').search(n):
-                    return False
+        if isRejectedName(cfg,dist,targetarch,n):
+            return False
         if cfg.multiwhitelists.has_key(dist) and cfg.multiwhitelists[dist].has_key(targetarch):
             for r in cfg.multiwhitelists[dist][targetarch]:
                 if re.compile('^'+r+'$').search(n):
@@ -217,7 +226,7 @@
 
             self.resolved[dep] = True
             for p in results:
-                if not isWantedName(self.pushcfg,self.dist,self.targetarch,[p.returnSimple('name')]):
+                if isRejectedName(self.pushcfg,self.dist,self.targetarch,p.returnSimple('name')):
                     continue
                 self.addNeededPkg(p)
                 self.resolveRequires(p)