From 3c2abfd9f26052451f3083e6f4ae569db5e30d7e Mon Sep 17 00:00:00 2001
From: Tomas Kopecek <tkopecek@redhat.com>
Date: May 06 2020 12:41:03 +0000
Subject: cli: fix sigmd5 checking


Fixes: https://pagure.io/koji/issue/2221

---

diff --git a/cli/koji_cli/lib.py b/cli/koji_cli/lib.py
index 967f6e8..36af956 100644
--- a/cli/koji_cli/lib.py
+++ b/cli/koji_cli/lib.py
@@ -580,8 +580,13 @@ def download_rpm(build, rpm, topurl, sigkey=None, quiet=False, noprogress=False)
     # payload hash
     sigmd5 = koji.get_header_fields(path, ['sigmd5'])['sigmd5']
     if rpm['payloadhash'] != koji.hex_string(sigmd5):
-        os.unlink(path)
-        error("Downloaded rpm %s doesn't match db, deleting" % path)
+        # older rpms, see add_rpm_sig in hub
+        sighdr = koji.rip_rpm_sighdr(path)
+        rawhdr = koji.RawHeader(sighdr)
+        sigmd5 = rawhdr.get(koji.RPM_SIGTAG_MD5)
+        if rpm['payloadhash'] != koji.hex_string(sigmd5):
+            os.unlink(path)
+            error("Downloaded rpm %s doesn't match db SIGMD5, deleting" % path)
 
 
 def download_archive(build, archive, topurl, quiet=False, noprogress=False):