robojerk/tumbi-assembler
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

util: Resolve ref if duplicate branches are present

Browse source 
If the repo contains the same name under multiple directories, make the
resolving work by filtering only to refs/heads and refs/tags.

Fixes: https://pagure.io/pungi/issue/1180
Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
This commit is contained in:
Lubomír Sedlář 2019-05-07 08:28:20 +02:00
parent 9517df44c7
commit b0f0579a9e
2 changed files with 19 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
pungi/util.py
View file

@ -263,7 +263,10 @@ def resolve_git_ref(repourl, ref):
_, output = git_ls_remote(repourl, ref)
lines = [line for line in output.split('\n') if line]
lines = []
for line in output.split("\n"):
if line and ("refs/heads/" in line or "refs/tags/" in line or "HEAD" in line):
lines.append(line)
if len(lines) == 0:
# Branch does not exist in remote repo
raise GitUrlResolveError(
@ -272,7 +275,7 @@ def resolve_git_ref(repourl, ref):
if len(lines) != 1:
# This should never happen. HEAD can not match multiple commits in a
# single repo, and there can not be a repo without a HEAD.
raise GitUrlResolveError("Failed to resolve %s", repourl)
raise GitUrlResolveError("Failed to resolve %r in %s" % (ref, repourl))
return lines[0].split()[0]