From 2a018a649fba7d8ddc2451612698be9be6a0c237 Mon Sep 17 00:00:00 2001 From: mprahl Date: Mon, 29 Jan 2018 14:33:35 -0500 Subject: [PATCH 1/2] Add consistency to the type of quotes used in "buildroot_add_repos" --- module_build_service/builder/MockModuleBuilder.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module_build_service/builder/MockModuleBuilder.py b/module_build_service/builder/MockModuleBuilder.py index 8f2461df..32273457 100644 --- a/module_build_service/builder/MockModuleBuilder.py +++ b/module_build_service/builder/MockModuleBuilder.py @@ -316,7 +316,7 @@ class MockModuleBuilder(GenericBuilder): koji_session = koji.ClientSession(koji_config.server, opts=koji_config) repo = koji_session.getRepo(repo_name) if repo: - baseurl = koji.PathInfo(topdir=koji_config.topurl).repo(repo['id'], repo_name) + baseurl = koji.PathInfo(topdir=koji_config.topurl).repo(repo["id"], repo_name) baseurl = '{0}/{1}/'.format(baseurl, self.arch) else: repo_dir = os.path.join(self.config.cache_dir, "koji_tags", tag) From 2651d53603290dc619a61ce50a7c6adc2f2523e7 Mon Sep 17 00:00:00 2001 From: mprahl Date: Mon, 29 Jan 2018 14:34:04 -0500 Subject: [PATCH 2/2] Use external repos tied to the Koji tags on local builds --- module_build_service/builder/MockModuleBuilder.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/module_build_service/builder/MockModuleBuilder.py b/module_build_service/builder/MockModuleBuilder.py index 32273457..7611f103 100644 --- a/module_build_service/builder/MockModuleBuilder.py +++ b/module_build_service/builder/MockModuleBuilder.py @@ -323,6 +323,9 @@ class MockModuleBuilder(GenericBuilder): create_local_repo_from_koji_tag(self.config, tag, repo_dir, [self.arch, "noarch"]) baseurl = "file://" + repo_dir + # Check to see if there are any external repos tied to the tag + for ext_repo in koji_session.getTagExternalRepos(repo_name): + self._add_repo(ext_repo["external_repo_name"], ext_repo["url"]) self._add_repo(repo_name, baseurl) self._write_mock_config()