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

consolidate access to rpm headers

Browse source 
Fixes: https://pagure.io/koji/issue/1069
This commit is contained in:
Tomas Kopecek 2018-08-29 14:09:52 +02:00 • committed by Mike McLean
parent bdec8c7399
commit e010e9afdc
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
hub/kojihub.py
View file

@ -5410,7 +5410,7 @@ def import_rpm(fn, buildinfo=None, brootid=None, wrapper=False, fileinfo=None):
rpminfo['id'] = _singleValue("""SELECT nextval('rpminfo_id_seq')""")
rpminfo['build_id'] = buildinfo['id']
rpminfo['size'] = os.path.getsize(fn)
rpminfo['payloadhash'] = koji.hex_string(hdr[rpm.RPMTAG_SIGMD5])
rpminfo['payloadhash'] = koji.hex_string(koji.get_header_field(hdr, 'sigmd5'))
rpminfo['buildroot_id'] = brootid
rpminfo['external_repo_id'] = 0
@ -6617,10 +6617,10 @@ def _scan_sighdr(sighdr, fn):
#(we have no payload, so verifies would fail otherwise)
hdr = ts.hdrFromFdno(outp.fileno())
outp.close()
sig = hdr[rpm.RPMTAG_SIGGPG]
sig = koji.get_header_field(hdr, 'siggpg')
if not sig:
sig = hdr[rpm.RPMTAG_SIGPGP]
return hdr[rpm.RPMTAG_SIGMD5], sig
sig = koji.get_header_field(hdr, 'sigpgp')
return koji.get_header_field(hdr, 'sigmd5'), sig
def check_rpm_sig(an_rpm, sigkey, sighdr):
#verify that the provided signature header matches the key and rpm
@ -6646,9 +6646,9 @@ def check_rpm_sig(an_rpm, sigkey, sighdr):
except:
pass
raise
raw_key = hdr[rpm.RPMTAG_SIGGPG]
raw_key = koji.get_header_field(hdr, 'siggpg')
if not raw_key:
raw_key = hdr[rpm.RPMTAG_SIGPGP]
raw_key = koji.get_header_field(hdr, 'sigpgp')
if not raw_key:
found_key = None
else: