extras-buildsys/utils/pushscript MultiLib.py,1.13,1.14

[Michael Schwendt (mschwendt)]

Author: mschwendt

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

Modified Files:
	MultiLib.py 
Log Message:
consider that testing requires stable


Index: MultiLib.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/MultiLib.py,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- MultiLib.py	6 Sep 2007 12:33:13 -0000	1.13
+++ MultiLib.py	6 Sep 2007 13:23:21 -0000	1.14
@@ -320,14 +320,22 @@
         if repoid.find('testing')<0:
             # Make available new multi-lib deps from non-testing repo.
             srcreporoot = os.path.join(cfg.treedir,dist,srcarch)
+            addfromext = True
         else:
             srcreporoot = os.path.join(cfg.treedir,testdist,srcarch)
+            addfromext = False
         for f in my.needed[repoid]['rpms']:
+            if addfromext:
+                if os.path.exists(os.path.join(cfg.treedir,dist,targetarch,f)):
+                    continue
             if addrpm(f,srcreporoot,destreporoot):
                 changed = True
         destdebugreporoot = os.path.join(destreporoot,'debug')
         srcdebugreporoot = os.path.join(srcreporoot,'debug')
         for f in my.needed[repoid]['debug']:
+            if addfromext:
+                if os.path.exists(os.path.join(cfg.treedir,dist,targetarch,'debug',f)):
+                    continue
             if addrpm(f,srcdebugreporoot,destdebugreporoot):
                 changed = True