From 5faa5178b46d26f91c62f10f159ae5e64761aa43 Mon Sep 17 00:00:00 2001
From: Nick Bolton <nick@synergy-project.org>
Date: Tue, 26 May 2015 16:49:23 +0100
Subject: [PATCH] Remove 'heads/' string from git branch name #4695

---
 ext/toolchain/commands1.py | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/ext/toolchain/commands1.py b/ext/toolchain/commands1.py
index 9f8149c2..1c750a1d 100644
--- a/ext/toolchain/commands1.py
+++ b/ext/toolchain/commands1.py
@@ -1440,10 +1440,16 @@ class InternalCommands:
 		raise Exception('Could not find package name with pattern: ' + pattern)
 	
 	def dist_name_rev(self, type):
+		branch = "heads/" + 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" % (
-			self.getGitBranchName(), self.getGitRevision())
+		replace = "%s-%s" % (branch, revision)
 		return re.sub(pattern, replace, self.dist_name(type))
 	
 	def getDebianArch(self):