Skip to content

Commit c0c9824

Browse files
jbtrystramjoelcapitao
authored andcommitted
src/konflux-rpm-lockfile: pull $releasever from manifest
Make sure to not rely on manifest-provided $releasever to resolves packages to avoid a desync. For RHEL we don't use releasever so using the host's value have no incidence, so no need to throw an error if it's missing.
1 parent dc1d6a2 commit c0c9824

File tree

1 file changed

+6
-0
lines changed

1 file changed

+6
-0
lines changed

src/konflux-rpm-lockfile

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -174,13 +174,19 @@ def generate_main(args):
174174
print(f"flattened manifest not found at {manifest}")
175175
sys.exit(1)
176176

177+
releasever = manifest_data.get('releasever', None)
177178
repos = manifest_data.get('repos', [])
178179
repos += manifest_data.get('lockfile-repos', [])
179180

180181
# Tell dnf to load repos files from $contextdir
181182
repoquery_args = ["--refresh", "--quiet", f"--setopt=reposdir={contextdir}"]
182183
repoquery_args.extend([f"--repo={','.join(repos)}"])
183184

185+
if releasever is None:
186+
print("No 'releasever' found in the manifest. Using the host releasever", file=sys.stderr)
187+
else:
188+
repoquery_args.extend([f"--releasever={releasever}"])
189+
184190
packages = []
185191
for arch in arches_to_resolve:
186192
locks = get_locked_nevras(contextdir, arch)

0 commit comments

Comments
 (0)