From a4b4aedba8748de012e3c701ef54e3c8936d4871 Mon Sep 17 00:00:00 2001 From: Mike McLean Date: Jan 05 2024 10:00:59 +0000 Subject: fix compat_mode case --- diff --git a/builder/kojid b/builder/kojid index 8b85b9e..fe35e47 100755 --- a/builder/kojid +++ b/builder/kojid @@ -911,14 +911,10 @@ class BuildRoot(object): opts = dict([(k, getattr(self.options, k)) for k in ('topurl', 'topdir')]) rpmlist_path = os.path.join(self.get_repo_dir(), self.br_arch, 'rpmlist.jsonl') - repo_rpms = {} compat_mode = False try: with koji.openRemoteFile(rpmlist_path, **opts) as fo: - for line in fo: - repo_rpm = json.loads(line) - nvra = "%(name)s-%(version)s-%(release)s.%(arch)s" % repo_rpm - repo_rpms[nvra] = repo_rpm + repo_rpms = [json.loads(line) for line in fo] except requests.exceptions.HTTPError as e: if e.response.status_code == 404: self.logger.warning("Missing repo content file: %s", rpmlist_path) @@ -928,6 +924,7 @@ class BuildRoot(object): else: raise fmt = "%(name)s-%(version)s-%(release)s.%(arch)s" + repo_rpms = {fmt % r: r for r in repo_rpms} for rpm_info in rpmlist: if 'external_repo' in rpm_info: continue