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

error if payloadhash mismatch

Browse source
This commit is contained in:
Yu Ming Zhu 2023-12-05 14:44:56 +00:00
parent 931bdb9292
commit 025b0a136f
1 changed files with 10 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

17
builder/kojid
View file

@ -938,19 +938,21 @@ class BuildRoot(object):
self.compat_map_internal_rpms(rpmlist)
return
raise
fmt = "%(name)s-%(version)s-%(release)s.%(arch)s"
for rpm_info in rpmlist:
if 'external_repo' in rpm_info:
continue
nvra = "%(name)s-%(version)s-%(release)s.%(arch)s" % rpm_info
nvra = fmt % rpm_info
data = repo_rpms.get(nvra)
if not data:
self.logger.warning("%s not found in rpmlist.jsonl", nvra)
continue
# check payloadhash in case they are different
elif data['payloadhash'] != rpm_info['payloadhash']:
self.logger.error(
"RPM: %s: payloadhash: %s mismatch expected %s in rpmlist.jsonl",
nvra, rpm_info['payloadhash'], data['payloadhash'])
raise koji.BuildrootError(
"RPM: %s: payloadhash: %s mismatch expected %s in rpmlist.jsonl"
% (nvra, rpm_info['payloadhash'], data['payloadhash'])
)
else:
# set rpm id
rpm_info['id'] = data['id']
@ -972,9 +974,10 @@ class BuildRoot(object):
if data:
# draft rpm!
if data['payloadhash'] != rpminfo['payloadhash']:
self.logger.error(
"RPM: %s: payloadhash: %s mismatch expected %s",
nvra, rpminfo['payloadhash'], data['payloadhash'])
raise koji.BuildrootError(
"RPM: %s: payloadhash: %s mismatch expected %s"
% (nvra, rpminfo['payloadhash'], data['payloadhash'])
)
else:
# set rpm id
rpminfo['id'] = data['id']