From 8b643fd56614102c4c9dea721603cd89a1c112cd Mon Sep 17 00:00:00 2001 From: Neil Hanlon Date: Thu, 3 Oct 2024 16:46:21 -0400 Subject: [PATCH] fix: pass extra repos --- iso/empanadas/empanadas/util/dnf_utils.py | 1 + iso/empanadas/empanadas/util/iso_utils.py | 4 +++- iso/empanadas/empanadas/util/shared.py | 2 ++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/iso/empanadas/empanadas/util/dnf_utils.py b/iso/empanadas/empanadas/util/dnf_utils.py index 862af8e..b737f8b 100644 --- a/iso/empanadas/empanadas/util/dnf_utils.py +++ b/iso/empanadas/empanadas/util/dnf_utils.py @@ -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'] diff --git a/iso/empanadas/empanadas/util/iso_utils.py b/iso/empanadas/empanadas/util/iso_utils.py index 3ff539f..599ac33 100644 --- a/iso/empanadas/empanadas/util/iso_utils.py +++ b/iso/empanadas/empanadas/util/iso_utils.py @@ -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) diff --git a/iso/empanadas/empanadas/util/shared.py b/iso/empanadas/empanadas/util/shared.py index fb053dc..6406c8d 100644 --- a/iso/empanadas/empanadas/util/shared.py +++ b/iso/empanadas/empanadas/util/shared.py @@ -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