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

added branch name to package names 

now that buildbot builds branches, it'll be handy to see that branch
name in the package name.
This commit is contained in:
Nick Bolton 2014-10-22 13:55:39 +01:00
parent 972922607b
commit 07d56e8e03
1 changed files with 28 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
ext/toolchain/commands1.py
View File

@ -946,7 +946,7 @@ class InternalCommands:
def getGitRevision(self): def getGitRevision(self):
if sys.version_info < (2, 4): if sys.version_info < (2, 4):
raise Exception("Python 2.4 or greater required.") raise Exception("Python 2.4 or greater required.")
else:
p = subprocess.Popen( p = subprocess.Popen(
["git", "log", "--pretty=format:%h", "-n", "1"], ["git", "log", "--pretty=format:%h", "-n", "1"],
stdout=subprocess.PIPE, stderr=subprocess.PIPE) stdout=subprocess.PIPE, stderr=subprocess.PIPE)
@ -954,9 +954,24 @@ class InternalCommands:
stdout, stderr = p.communicate() stdout, stderr = p.communicate()
if p.returncode != 0: if p.returncode != 0:
raise Exception('Could not get revision - git info failed with code: ' + str(p.returncode)) raise Exception('Could not get revision, git error: ' + str(p.returncode))
return stdout return stdout.strip()
def getGitBranchName(self):
if sys.version_info < (2, 4):
raise Exception("Python 2.4 or greater required.")
p = subprocess.Popen(
["git", "rev-parse", "--abbrev-ref", "HEAD"],
stdout=subprocess.PIPE, stderr=subprocess.PIPE)
stdout, stderr = p.communicate()
if p.returncode != 0:
raise Exception('Could not get branch name, git error: ' + str(p.returncode))
return stdout.strip()
def find_revision_svn(self): def find_revision_svn(self):
if sys.version_info < (2, 4): if sys.version_info < (2, 4):
@ -1422,7 +1437,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>-' + self.find_revision() + '\g<2>' replace = "\g<1>-%s@%s\g<2>" % (
self.getGitBranchName(), self.getGitRevision())
return re.sub(pattern, replace, self.dist_name(type)) return re.sub(pattern, replace, self.dist_name(type))
def dist_usage(self): def dist_usage(self):