rayelliott
/
barrier
mirror of https://github.com/debauchee/barrier.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Resolve #4455 replaced version with branch name

This commit is contained in:
XinyuHou 2015-03-20 12:22:56 +00:00
parent 5aaaa784ab
commit d3b3513f4b
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ext/toolchain/commands1.py
View File

@ -1359,8 +1359,8 @@ class InternalCommands:
def dist_name_rev(self, type): def dist_name_rev(self, type):
# find the version number (we're puting the rev in after this) # find the version number (we're puting the rev in after this)
pattern = '(.*\d+\.\d+\.\d+)(.*)' pattern = '(\d+\.\d+\.\d+)'
replace = "\g<1>-%s-%s\g<2>" % ( replace = "%s-%s" % (
self.getGitBranchName(), self.getGitRevision()) self.getGitBranchName(), self.getGitRevision())
return re.sub(pattern, replace, self.dist_name(type)) return re.sub(pattern, replace, self.dist_name(type))