extras-buildsys/utils/pushscript Config_EPEL.py,1.7,1.8

[Dennis Gilmore (ausil)]

Author: ausil

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

Modified Files:
	Config_EPEL.py 
Log Message:
apply patch enabling testing/stable



Index: Config_EPEL.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/Config_EPEL.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Config_EPEL.py	15 Aug 2007 02:29:22 -0000	1.7
+++ Config_EPEL.py	6 Sep 2007 06:28:54 -0000	1.8
@@ -28,12 +28,13 @@
     mail = True
     repoprune = True
     repoview = True
+    pushtotesting = True
     signkeycheck = True
-    doublesync = False
+
 
 top_workdir = '/srv/rpmbuild'
 
-treedir = top_workdir+'/%s/tree/%s/testing' % (project, project)
+treedir = top_workdir+'/%s/tree/%s' % (project, project)
 stagesdir = top_workdir+'/repodir'
 
 # Where we store mails to be sent, our main lockfile, ...
@@ -41,32 +42,42 @@
 rundir = top_workdir+'/epel-push-rundir'
 cachedir = rundir+'/mdcache'
 
-alldists = [ '5', '4' ] # also the order in build reports
+alldists = [ '5', 'testing/5', '4', 'testing/4' ] # also the order in build reports
 
 frozendists = []
 
 archdict = { 
             '4':['ppc','x86_64', 'i386'],
             '5':['ppc','x86_64', 'i386']
+            'testing/4':['ppc','x86_64', 'i386'],
+            'testing/5':['ppc','x86_64', 'i386']
             }
 
-multilibdists = [ '5', '4' ]
+multilibdists = [ '5', 'testing/5', '4', 'testing/4' ]
 
 # 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 = { '5' : { 'x86_64' : [ 'gnustep-make', 'nagios*'] },
-               '4' : { 'x86_64' : [ 'ghex', 'graphviz', 'libgnomeuimm26', 'nagios*'] },
+multiblacklists = {
+    '5' : { 'x86_64' : [ 'gnustep-make', 'nagios.*'] },
+    '4' : { 'x86_64' : [ 'ghex', 'graphviz', 'libgnomeuimm26', 'nagios.*'] },
+    'testing/5' : { 'x86_64' : [ 'gnustep-make', 'nagios.*'] },
+    'testing/4' : { 'x86_64' : [ 'ghex', 'graphviz', 'libgnomeuimm26', 'nagios.*'] },
                }
+
 multiwhitelists = { 
-               '5' : { 'x86_64' : [ '.*-devel', 'wine', 'wine-arts', 'wine-devel' ] },
-               '4' : { 'x86_64' : [ '.*-devel', 'wine', 'wine-arts', 'wine-devel' ] },
+    '5' : { 'x86_64' : [ '.*-devel', 'wine', 'wine-arts', 'wine-devel' ] },
+    '4' : { 'x86_64' : [ '.*-devel', 'wine', 'wine-arts', 'wine-devel' ] },
+    'testing/5' : { 'x86_64' : [ '.*-devel', 'wine', 'wine-arts', 'wine-devel' ] },
+    'testing/4' : { 'x86_64' : [ '.*-devel', 'wine', 'wine-arts', 'wine-devel' ] },
                }
 
 # packages to exclude from being pruned: dist => Python regexp list
-repoprune_keepdict = {'3': ["-kmod$","amaya","gnome-vfsmm26","libgnomemm26","libgnomeuimm26","xtide","wxGTK"],
+repoprune_keepdict = {
                       '4': ["-kmod$"],
                       '5': ["-kmod$"],
+                      'testing/4': ["-kmod$"],
+                      'testing/5': ["-kmod$"],
                       }
 
 # repository symlinks to remove/create since they confuse createrepo
@@ -76,8 +87,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 = { '5' : 'comps-el5.xml',
-              '4' : 'comps-el4.xml',
+comps_map = { 'testing/5' : 'comps-el5.xml',
+              'testing/4' : 'comps-el4.xml',
               }
 
 diversion_dict = {}
@@ -94,13 +105,13 @@
               }
 
 # For RepoSupport.py features.
-testrepos = { '4' : [],
-              '5' : [],
-              'development' : []
+testrepos = { '4' : ['fedora-epel-testing'],
+              '5' : ['fedora-epel-testing']
               }
 
 # For RepoSupport.py features.
-reponames = { 'fedora-epel' : 'Fedora EPEL'
+reponames = { 'fedora-epel' : 'Fedora EPEL',
+              'fedora-epel-testing' : 'Fedora EPEL Test Updates'
               }
 
 # For RepoSupport.py features.