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

provide more information to the pre/postRPMSign callback

Browse source 
The existing pre/postRPMSign callback was following the format of
the Task/BuildStateChange callbacks. This isn't necessary for a
one-time operation. This change removes the attribute/old/new
arguments, and replaces them with sigkey, sighash, build, and rpm
arguments. This is more clear, and should make writing handlers
for this callback simpler.
This commit is contained in:
Mike Bonnet 2016-10-20 13:38:29 -07:00
parent c41107ea51
commit 238d1db039
1 changed files with 2 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
hub/kojihub.py
View file

@ -6100,10 +6100,7 @@ def add_rpm_sig(an_rpm, sighdr):
#TODO[?] - if sighash is the same, handle more gracefully
nvra = "%(name)s-%(version)s-%(release)s.%(arch)s" % rinfo
raise koji.GenericError, "Signature already exists for package %s, key %s" % (nvra, sigkey)
callback_info = copy.copy(rinfo)
callback_info['sigkey'] = sigkey
callback_info['sighash'] = sighash
koji.plugin.run_callbacks('preRPMSign', attribute='sighash', old=None, new=sighash, info=callback_info)
koji.plugin.run_callbacks('preRPMSign', sigkey=sigkey, sighash=sighash, build=binfo, rpm=rinfo)
insert = """INSERT INTO rpmsigs(rpm_id, sigkey, sighash)
VALUES (%(rpm_id)s, %(sigkey)s, %(sighash)s)"""
_dml(insert, locals())
@ -6113,7 +6110,7 @@ def add_rpm_sig(an_rpm, sighdr):
fo = file(sigpath, 'wb')
fo.write(sighdr)
fo.close()
koji.plugin.run_callbacks('postRPMSign', attribute='sighash', old=None, new=sighash, info=callback_info)
koji.plugin.run_callbacks('postRPMSign', sigkey=sigkey, sighash=sighash, build=binfo, rpm=rinfo)
def _scan_sighdr(sighdr, fn):
"""Splices sighdr with other headers from fn and queries (no payload)"""