fresh-empanadas - Bug fixes #20

Open
kemotaha wants to merge 16 commits from kemotaha/toolkit:fresh-empanadas into fresh-empanadas
3 changed files with 6 additions and 1 deletions
Showing only changes of commit 8b643fd566 - Show all commits

View file

@ -102,6 +102,7 @@ class RepoSync:
self.project_id = rlvars['project_id']
self.repo_renames = rlvars['renames']
self.repos = rlvars['all_repos']
self.extra_repos = rlvars['extra_repos']
self.multilib = rlvars['provide_multilib']
self.repo = repo
self.extra_files = rlvars['extra_files']

View file

@ -110,6 +110,7 @@ class IsoBuild:
self.revision = rlvars['revision']
self.rclvl = rlvars['rclvl']
self.repos = rlvars['iso_map']['lorax']['repos']
self.extra_repos = rlvars['extra_repos']
self.repo_base_url = config['repo_base_url']
self.project_id = rlvars['project_id']
self.structure = rlvars['structure']
@ -202,7 +203,8 @@ class IsoBuild:
self.current_arch,
self.compose_latest_sync,
self.compose_dir_is_here,
self.hashed
self.hashed,
self.extra_repos
)
self.log.info(self.revision_level)

View file

@ -947,6 +947,8 @@ class Shared:
# must be in format URL[,PRIORITY]
result = []
for idx, candidate in enumerate(extra_repos):
if isinstance(dict, candidate):
url, priority = candidate['url'], candidate.get('priority', None)
url, priority = candidate.split(',')
if not priority:
priority = 100