extras-buildsys/utils/pushscript Config_EPEL.py,1.3,1.4

[Dennis Gilmore (ausil)]

Author: ausil

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

Modified Files:
	Config_EPEL.py 
Log Message:
blacklist nagios from multilib on EL-5  use correct comps files




Index: Config_EPEL.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/Config_EPEL.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Config_EPEL.py	19 Apr 2007 23:32:10 -0000	1.3
+++ Config_EPEL.py	27 Jun 2007 19:43:48 -0000	1.4
@@ -57,7 +57,7 @@
 # map: dist -> target arch -> list of pkg name regexp patterns
 # We don't check virtual package names, unless it's a virtual -devel pkg.
 # black-list takes precedence over white-list
-multiblacklists = { 'development' : { 'x86_64' : [ 'gnustep-make'] },
+multiblacklists = { '5' : { 'x86_64' : [ 'gnustep-make', 'nagios*'] },
                }
 multiwhitelists = { 'development' : { 'x86_64' : [ '.*-devel', 'wine', 'wine-arts', 'wine-devel' ] },
                '5' : { 'x86_64' : [ '.*-devel', 'wine', 'wine-arts', 'wine-devel' ] },
@@ -79,9 +79,8 @@
 comps_up_pass1 = 'LC_ALL=C CVS_RSH=ssh cvs -f -d :pserver:anonymous at cvs.fedora.redhat.com:/cvs/extras update'
 comps_up_pass2 = 'make -f Makefile'
 comps_dangerousfiles = ['Makefile','update-comps','po/Makefile']
-comps_map = { 'development' : 'comps-fe7.xml',
-              '6' : 'comps-fe6.xml',
-              '5' : 'comps-fe5.xml',
+comps_map = { '5' : 'comps-el5.xml',
+              '4' : 'comps-el4.xml',
               }
 
 diversion_dict = {}