modules/fm-orchestrator
1
0
Fork 0
mirror of https://pagure.io/fm-orchestrator.git synced 2026-02-03 05:03:43 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add backwards-compatibility for cloning local repos with the artifact name and not the full path

Browse Source 
This addresses #1211
This commit is contained in:
mprahl
2019-04-11 10:19:30 -04:00
parent bf58a03cbf
commit 83bc780a23
2 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
module_build_service/builder/MockModuleBuilder.py
View File

@@ -591,14 +591,10 @@ class SCMBuilder(BaseBuilder):
def __init__(self, config, resultsdir, source, artifact_name):
super(SCMBuilder, self).__init__(config, resultsdir)
with open(config, "a") as f:
git_repo, branch = source.split("?#")
repo_path, branch = source.split("?#")
distgit_cmds = self._get_distgit_commands(source)
if source.startswith("file://"):
# For local git repositories, pass the full path to repository to git command.
distgit_get = distgit_cmds[0].format(git_repo)
else:
distgit_get = distgit_cmds[0].format(artifact_name)
# Supply the artifact name for "{0}" and the full path to the repo for "{repo_path}"
distgit_get = distgit_cmds[0].format(artifact_name, repo_path=repo_path)
# mock-scm cannot checkout particular commit hash, but only branch.
# We therefore use a command that combines the distgit-command with
@@ -631,8 +627,8 @@ class SCMBuilder(BaseBuilder):
# local builds.
# Instead, get them from local path with git repository by passing that path to Mock
# using the `ext_src_dir`.
if git_repo.startswith("file://"):
src_dir = git_repo[len("file://"):]
if repo_path.startswith("file://"):
src_dir = repo_path[len("file://"):]
f.write("config_opts['scm_opts']['ext_src_dir'] = '{}'\n".format(src_dir))
def _make_executable(self, path):

2
module_build_service/config.py
View File

@@ -336,7 +336,7 @@ class Config(object):
'default': {
'https://src.fedoraproject.org': ('fedpkg clone --anonymous {}',
'fedpkg --release module sources'),
'file://': ('git clone {}', None),
'file://': ('git clone {repo_path}', None),
},
'desc': 'Mapping between dist-git and command to '},
'mock_config': {