From 99ba03b52d6b3e71088005405ee5816c7b90eb67 Mon Sep 17 00:00:00 2001 From: Jakub Kadlčík Date: May 17 2017 14:23:16 +0000 Subject: Move also distgit_src_get command to config --- diff --git a/module_build_service/builder/MockModuleBuilder.py b/module_build_service/builder/MockModuleBuilder.py index b660c1a..af3bd68 100644 --- a/module_build_service/builder/MockModuleBuilder.py +++ b/module_build_service/builder/MockModuleBuilder.py @@ -446,18 +446,19 @@ class SCMBuilder(BaseBuilder): super(SCMBuilder, self).__init__(config, resultsdir) with open(config, "a") as f: branch = source.split("?#")[1] - dist_git_get = self._get_clone_command(source).format(artifact_name) + distgit_cmds = self._get_distgit_commands(source) + distgit_get = distgit_cmds[0].format(artifact_name) f.writelines([ "config_opts['scm'] = True\n", "config_opts['scm_opts']['method'] = 'distgit'\n", "config_opts['scm_opts']['branch'] = '{}'\n".format(branch), "config_opts['scm_opts']['package'] = '{}'\n".format(artifact_name), - "config_opts['scm_opts']['distgit_get'] = '{}'\n".format(dist_git_get), - "config_opts['scm_opts']['distgit_src_get'] = 'fedpkg sources'\n", + "config_opts['scm_opts']['distgit_get'] = '{}'\n".format(distgit_get), + "config_opts['scm_opts']['distgit_src_get'] = '{}'\n".format(distgit_cmds[1]), ]) - def _get_clone_command(self, source): - for host, cmd in conf.distgits.items(): + def _get_distgit_commands(self, source): + for host, cmds in conf.distgits.items(): if source.startswith(host): - return cmd - raise KeyError("No defined command for {}".format(source)) + return cmds + raise KeyError("No defined commands for {}".format(source)) diff --git a/module_build_service/config.py b/module_build_service/config.py index 37a7dfb..3a1e976 100644 --- a/module_build_service/config.py +++ b/module_build_service/config.py @@ -289,7 +289,7 @@ class Config(object): 'distgits': { 'type': dict, 'default': { - 'git://pkgs.fedoraproject.org': 'fedpkg clone --anonymous {}', + 'git://pkgs.fedoraproject.org': ('fedpkg clone --anonymous {}', 'fedpkg sources'), }, 'desc': 'Mapping between dist-git and command to '}, 'mock_config': {