From f68f277ee691f058b2f65e1f7ae053bc9d9d6d1a Mon Sep 17 00:00:00 2001 From: Yu Ming Zhu Date: Jul 13 2020 06:16:24 +0000 Subject: hub: make sure checksum_type is int for DB fixes: #2368 --- diff --git a/hub/kojihub.py b/hub/kojihub.py index ed9c5bb..1d6be03 100644 --- a/hub/kojihub.py +++ b/hub/kojihub.py @@ -6548,7 +6548,7 @@ class CG_Importer(object): type_mismatches = 0 for archive in list_archives(filename=comp['filename'], size=comp['filesize']): - if archive['checksum_type'] != comp['checksum_type']: + if archive['checksum_type'] != koji.CHECKSUM_TYPES[comp['checksum_type']]: type_mismatches += 1 continue if archive['checksum'] == comp['checksum']: @@ -7202,14 +7202,15 @@ def import_archive_internal(filepath, buildinfo, type, typeInfo, buildroot_id=No archiveinfo['checksum_type'] = koji.CHECKSUM_TYPES['sha256'] else: archiveinfo['checksum'] = fileinfo['checksum'] - archiveinfo['checksum_type'] = fileinfo['checksum_type'] + archiveinfo['checksum_type'] = koji.CHECKSUM_TYPES[fileinfo['checksum_type']] if fileinfo: # check against metadata if archiveinfo['size'] != fileinfo['filesize']: raise koji.GenericError("File size mismatch for %s: %s != %s" % (filename, archiveinfo['size'], fileinfo['filesize'])) if (archiveinfo['checksum'] != fileinfo['checksum'] or - archiveinfo['checksum_type'] != fileinfo['checksum_type']): + archiveinfo['checksum_type'] != koji.CHECKSUM_TYPES[ + fileinfo['checksum_type']]): raise koji.GenericError("File checksum mismatch for %s: %s != %s" % (filename, archiveinfo['checksum'], fileinfo['checksum'])) archivetype = get_archive_type(filename, strict=True)