Adjust the output parsing of git name-rev to handle the output of the latest git version.
Signed-off-by: Simon Hausmann <hausmann@kde.org>maint
parent
5ea919de22
commit
6392a40e5e
|
@ -25,7 +25,10 @@ for o, a in opts:
|
||||||
sout, sin, serr = popen2.popen3("git-name-rev --tags `git-rev-parse %s`" % branch)
|
sout, sin, serr = popen2.popen3("git-name-rev --tags `git-rev-parse %s`" % branch)
|
||||||
output = sout.read()
|
output = sout.read()
|
||||||
tagIdx = output.index(" tags/p4/")
|
tagIdx = output.index(" tags/p4/")
|
||||||
caretIdx = output.index("^")
|
try:
|
||||||
|
caretIdx = output.index("^")
|
||||||
|
except:
|
||||||
|
caretIdx = len(output) - 1
|
||||||
rev = int(output[tagIdx + 9 : caretIdx])
|
rev = int(output[tagIdx + 9 : caretIdx])
|
||||||
|
|
||||||
allTags = os.popen("git tag -l p4/").readlines()
|
allTags = os.popen("git tag -l p4/").readlines()
|
||||||
|
|
Loading…
Reference in New Issue