extras-buildsys/utils/pushscript MultiLib.py,1.23,1.24

[Michael Schwendt]

Author: mschwendt

Update of /cvs/fedora/extras-buildsys/utils/pushscript
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3700

Modified Files:
	MultiLib.py 
Log Message:
scan less dirs, obsolete "multilibdists" config file value



Index: MultiLib.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/MultiLib.py,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- MultiLib.py	8 Feb 2009 21:34:27 -0000	1.23
+++ MultiLib.py	15 Feb 2009 14:33:26 -0000	1.24
@@ -80,12 +80,10 @@
     # Examine the package, see whether we want it for any of the
     # enabled multilib repositories. Then store the package names
     # in a map, which is used in pass 2 (install+resolve deps).
-    if dist not in cfg.multilibdists:
-        return
 
     for targetarch in cfg.archdict[dist]:  # list of repo archs
         if not compatarchdict.has_key(targetarch):
-            continue
+            continue  # don't multilib this repo (targetarch)
 
         pkg = YumLocalPackage(ts=ts,filename=fname)
         srcrpm = pkg.tagByName('sourcerpm')
@@ -152,10 +150,17 @@
 
 
 def evalFromTree(cfg,dist):
+    if dist not in cfg.multiwhitelists.keys():
+        return  # MultiLib.py not enabled for this dist
+
     ts = rpmUtils.transaction.initReadOnlyTransaction()
     global missingdict
     missingdict = {}
-    for srcarch in cfg.archdict[dist]:  # list of repo archs
+
+    for targetarch in biarchdict.keys():
+        if targetarch not in cfg.multiwhitelists[dist].keys():
+            continue  # don't multilib this repo arch
+        srcarch = biarchdict[targetarch]
         srcdir = Utils.rpm_repodir(cfg,dist,srcarch)
         print 'Scanning for multi-compat packages:', srcdir
         files = glob.glob('%s/*.rpm' % srcdir)
@@ -386,6 +391,9 @@
 # --------------------------------------------------------------------
 
 def main(cfg,dists):
+    if hasattr(cfg,'multilibdists'):
+        print 'WARNING: Config value "multilibdists" is obsolete.'
+
     for dist in dists:
         evalFromTree(cfg,dist)
         for arch in cfg.archdict[dist]:  # list of repo archs