Author: skvidal
Update of /cvs/fedora/extras-buildsys-temp/automation
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5132
Modified Files:
buildqueue.py extras-push.py
Log Message:
fixes to make things know about FC4 and extras-pushing with comps files.
Index: buildqueue.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys-temp/automation/buildqueue.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- buildqueue.py 10 May 2005 04:46:06 -0000 1.5
+++ buildqueue.py 31 May 2005 18:50:22 -0000 1.6
@@ -160,9 +160,15 @@
self.stages_root = '/rpmbuild/extras/stages'
targetdict = { 'fc-3': '3', 'devel':'development',
'3': '3', 'development': 'development',
- 'fc3': '3', 'rawhide': 'development'}
+ 'fc3': '3', 'rawhide': 'development',
+ 'fc4': '4', 'fc-4': '4', '4':'4',
+ 'fc5': '5', 'fc-5': '5', '5':'5',
+ 'fc6': '6', 'fc-6': '6', '6':'6'}
targetarches = {'3': ['i386', 'x86_64'],
- 'development': ['ppc','i386', 'x86_64']}
+ 'development': ['ppc','i386', 'x86_64'],
+ '4': ['ppc','i386', 'x86_64'],
+ '5': ['ppc','i386', 'x86_64'],
+ '6': ['ppc','i386', 'x86_64']}
self.repo = repo
self.tag = tag
if targetdict.has_key(targ_name.lower()):
Index: extras-push.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys-temp/automation/extras-push.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- extras-push.py 10 May 2005 04:46:06 -0000 1.4
+++ extras-push.py 31 May 2005 18:50:22 -0000 1.5
@@ -36,6 +36,7 @@
stagesdir = '/rpmbuild/extras/stages'
treedir = '/rpmbuild/extras/tree/extras'
+compsname = 'comps.xml'
archdict = {'3':['x86_64', 'i386'],
'development':['ppc','x86_64','i386'],
'4':['ppc','x86_64', 'i386']}
@@ -128,10 +129,25 @@
def sign_pkgs(filelist):
"""gpg sign all the rpms"""
- foo = string.join(filelist)
- result = os.system('echo %s | xargs rpm --resign' % foo)
- if result != 0:
+ numfiles = len(filelist)
+ if numfiles < 1:
+ print "No packages to sign"
return False
+
+ while numfiles > 0:
+ if numfiles > 256:
+ files = filelist[:256]
+ del filelist[:256]
+ else:
+ files = filelist
+ filelist = []
+
+ foo = string.join(files)
+ result = os.system('echo %s | xargs rpm --resign' % foo)
+ if result != 0:
+ return False
+ numfiles = len(filelist)
+
return True
def main(dist):
@@ -228,10 +244,14 @@
# arch repo creation
for arch in archdict[dist]:
repodir = os.path.join(destdir, arch)
+ compspath = os.path.join(repodir, compsname)
rpdata = os.path.join(repodir, 'repodata')
debugprint('removing tree %s' % rpdata)
shutil.rmtree(rpdata)
- cmd = '/usr/bin/createrepo -q -x *debuginfo* %s' % repodir
+ if os.path.exists(compspath):
+ cmd = '/usr/bin/createrepo -q -g %s -x *debuginfo* %s' % (compsname, repodir)
+ else:
+ cmd = '/usr/bin/createrepo -q -x *debuginfo* %s' % repodir
debugprint(cmd)
result = os.system(cmd)
cmd = '/usr/bin/repoview %s' % repodir