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

clean up logic to avoid duplicate code

Browse source
This commit is contained in:
Mike McLean 2017-03-02 10:31:14 -05:00
parent 1371b18886
commit cea00501a6
1 changed files with 7 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

17
builder/kojid
View file

@ -4979,16 +4979,13 @@ class NewSignedRepoTask(BaseTaskHandler):
for (arch, task_id) in subtasks.iteritems():
data[arch] = results[task_id]
self.logger.debug("DEBUG: %r : %r " % (arch, data[arch]))
if task_opts['multilib']:
# we moved the 32-bit results before, do the 64-bit
if arch not in arch32s:
upload, files, keypaths = results[subtasks[arch]]
self.session.host.signedRepoMove(
repo_id, upload, files, arch, keypaths)
else:
upload, files, keypaths = results[subtasks[arch]]
self.session.host.signedRepoMove(
repo_id, upload, files, arch, keypaths)
if task_opts['multilib'] and arch in arch32s:
# already moved above
continue
#else
upload, files, keypaths = results[subtasks[arch]]
self.session.host.signedRepoMove(
repo_id, upload, files, arch, keypaths)
self.session.host.repoDone(repo_id, data, expire=False)
return 'Signed repository #%s successfully generated' % repo_id