particle-os/debian-koji
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

initial attempt at supporting noarch subpackages.

Browse source 
right now it will take them from the first arch in the build arch list
This commit is contained in:
Dennis Gilmore 2009-01-12 22:58:48 -06:00
parent 1c3289392c
commit 285e91ec35
1 changed files with 18 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

19
builder/kojid
View file

@ -1806,6 +1806,10 @@ class BuildTask(BaseTaskHandler):
for fn in result['rpms']:
rpms.append(fn)
brmap[fn] = brootid
for fn in result['noarch_rpms']:
if not fn in rpms:
rpms.append(fn)
brmap[fn] = brootid
for fn in result['logs']:
logs.setdefault(arch,[]).append(fn)
if len(result['srpms']) == 1:
@ -1897,6 +1901,7 @@ class BuildArchTask(BaseTaskHandler):
rpm_files = []
srpm_files = []
log_files = []
noarch_rpm_files = []
unexpected = []
for f in os.listdir(resultdir):
# files here should have one of two extensions: .log and .rpm
@ -1904,11 +1909,14 @@ class BuildArchTask(BaseTaskHandler):
log_files.append(f)
elif f[-8:] == ".src.rpm":
srpm_files.append(f)
elif f[-11:] == ".noarch.rpm":
noarch_rpm_files.append(f)
elif f[-4:] == ".rpm":
rpm_files.append(f)
else:
unexpected.append(f)
self.logger.debug("rpms: %r" % rpm_files)
self.logger.debug("noarch rpms: %r" % noarch_rpm_files)
self.logger.debug("srpms: %r" % srpm_files)
self.logger.debug("logs: %r" % log_files)
self.logger.debug("unexpected: %r" % unexpected)
@ -1917,6 +1925,8 @@ class BuildArchTask(BaseTaskHandler):
uploadpath = broot.getUploadPath()
for f in rpm_files:
self.uploadFile("%s/%s" % (resultdir,f))
for f in noarch_rpm_files:
self.uploadFile("%s/%s" % (resultdir,f))
self.logger.debug("keep srpm %i %s %s" % (self.id, keep_srpm, opts))
if keep_srpm:
if len(srpm_files) == 0:
@ -1929,7 +1939,14 @@ class BuildArchTask(BaseTaskHandler):
self.logger.debug("uploading %s/%s to %s" % (resultdir,srpm_files[0], uploadpath))
self.uploadFile("%s/%s" % (resultdir,srpm_files[0]))
ret['rpms'] = [ "%s/%s" % (uploadpath,f) for f in rpm_files ]
if not rpm_files == []:
ret['rpms'] = [ "%s/%s" % (uploadpath,f) for f in rpm_files ]
else:
ret['rpms'] = []
if not noarch_rpm_files == []:
ret['noarch_rpms'] = [ "%s/%s" % (uploadpath,f) for f in noarch_rpm_files ]
else:
ret['noarch_rpms'] = []
if keep_srpm:
ret['srpms'] = [ "%s/%s" % (uploadpath,f) for f in srpm_files ]
else: