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

fix compat_mode case

Browse source
This commit is contained in:
Mike McLean 2024-01-04 10:19:33 -05:00 • committed by Yu Ming Zhu
parent 5591709735
commit a4b4aedba8
1 changed files with 2 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
builder/kojid
View file

@ -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