almalinux/pungi
14
1
Fork 0
Code Issues Pull Requests Releases Activity

kiwibuild: Remove repos as dicts

Browse Source 
The task needs just URLs, the dics don't bring anything here.

Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
(cherry picked from commit c80ebb029b)
This commit is contained in:
Lubomír Sedlář 2024-03-11 11:03:23 +01:00 committed by Stepan Oksanichenko
parent c17b820490
commit ab1960de6d
Signed by: soksanichenko
GPG Key ID: AB9983172AB1E45B
1 changed files with 4 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
pungi/phases/kiwibuild.py
View File

@ -36,23 +36,10 @@ class KiwiBuildPhase(
resolved_repos = [] resolved_repos = []
for repo in repos: for repo in repos:
if isinstance(repo, dict): repo = util.get_repo_url(compose, repo, arch=arch)
try: if repo is None:
url = repo["baseurl"] raise RuntimeError("Failed to resolve repo URL for %s" % repo)
except KeyError: resolved_repos.append(repo)
raise RuntimeError(
"`baseurl` is required in repo dict %s" % str(repo)
)
url = util.get_repo_url(compose, url, arch=arch)
if url is None:
raise RuntimeError("Failed to resolve repo URL for %s" % str(repo))
repo["baseurl"] = url
resolved_repos.append(repo)
else:
repo = util.get_repo_url(compose, repo, arch=arch)
if repo is None:
raise RuntimeError("Failed to resolve repo URL for %s" % repo)
resolved_repos.append(repo)
return resolved_repos return resolved_repos