sig_core/toolkit
sig_core/toolkit
7
2
Fork 3
Code Issues 6 Pull Requests 2 Actions Projects Releases Wiki Activity

fix: extra repos processing

Browse Source
This commit is contained in:
Neil Hanlon 2024-10-03 19:25:14 -04:00
parent 79e52d1302
commit 3967432d3d
Signed by: neil
GPG Key ID: 705BC21EC3C70F34
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
iso/empanadas/empanadas/util/shared.py
View File

@ -919,8 +919,10 @@ class Shared:
compose_latest_sync, compose_latest_sync,
compose_dir_is_here: bool = False, compose_dir_is_here: bool = False,
hashed: bool = False, hashed: bool = False,
extra_repos: list = None extra_repos: list = None,
): staging_base_url: str = 'https://dl.rockylinux.org/stg',
use_staging: bool = False,
):
""" """
Builds the repo dictionary Builds the repo dictionary
""" """
@ -954,7 +956,9 @@ class Shared:
repolist.append(repodata) repolist.append(repodata)
if extra_repos: if extra_repos:
repolist.append(repo for repo in Shared.parse_extra_repos(extra_repos)) extras = Shared.parse_extra_repos(extra_repos)
for repo in extras:
repolist.append(repo)
return repolist return repolist
@ -963,7 +967,7 @@ class Shared:
# must be in format URL[,PRIORITY] # must be in format URL[,PRIORITY]
result = [] result = []
for idx, candidate in enumerate(extra_repos): for idx, candidate in enumerate(extra_repos):
if isinstance(dict, candidate): if isinstance(candidate, dict):
url, priority = candidate['url'], candidate.get('priority', None) url, priority = candidate['url'], candidate.get('priority', None)
url, priority = candidate.split(',') url, priority = candidate.split(',')
if not priority: if not priority: