only check epoch against reservation if it is given

This commit is contained in:
Mike McLean 2019-07-16 10:41:43 -04:00
parent b5517d16d5
commit 1f52e60839

View file

@ -5762,9 +5762,13 @@ class CG_Importer(object):
raise koji.GenericError('Build ID %s is not in BUILDING state' % build_id)
if buildinfo['name'] != metadata['build']['name'] or \
buildinfo['version'] != metadata['build']['version'] or \
buildinfo['release'] != metadata['build']['release'] or \
buildinfo['epoch'] != metadata['build']['epoch']:
buildinfo['release'] != metadata['build']['release']:
raise koji.GenericError("Build (%i) NVR is different" % build_id)
if ('epoch' in metadata['build'] and
buildinfo['epoch'] != metadata['build']['epoch']):
raise koji.GenericError("Build (%i) epoch is different"
% build_id)
elif token is not None:
raise koji.GenericError('Reservation token given, but no build_id '
'in metadata')