From d6cefa73a00eed23a2a5978a1cc5ce32bfe7a6a8 Mon Sep 17 00:00:00 2001 From: Nick Bolton Date: Tue, 26 May 2015 16:49:59 +0100 Subject: [PATCH] Removed test prepend string from previous commit #4695 --- ext/toolchain/commands1.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ext/toolchain/commands1.py b/ext/toolchain/commands1.py index 1c750a1d..777d7e98 100644 --- a/ext/toolchain/commands1.py +++ b/ext/toolchain/commands1.py @@ -1440,13 +1440,13 @@ class InternalCommands: raise Exception('Could not find package name with pattern: ' + pattern) def dist_name_rev(self, type): - branch = "heads/" + self.getGitBranchName() + branch = self.getGitBranchName() revision = self.getGitRevision() # sometimes, git will prepend "heads/" infront of the branch name, # remove this as it's not useful to us and causes ftp issues. branch = re.sub("heads/", "", branch) - + # find the version number (we're puting the rev in after this) pattern = '(\d+\.\d+\.\d+)' replace = "%s-%s" % (branch, revision)