Removed test prepend string from previous commit #4695
This commit is contained in:
parent
5faa5178b4
commit
d6cefa73a0
|
@ -1440,13 +1440,13 @@ class InternalCommands:
|
||||||
raise Exception('Could not find package name with pattern: ' + pattern)
|
raise Exception('Could not find package name with pattern: ' + pattern)
|
||||||
|
|
||||||
def dist_name_rev(self, type):
|
def dist_name_rev(self, type):
|
||||||
branch = "heads/" + self.getGitBranchName()
|
branch = self.getGitBranchName()
|
||||||
revision = self.getGitRevision()
|
revision = self.getGitRevision()
|
||||||
|
|
||||||
# sometimes, git will prepend "heads/" infront of the branch name,
|
# sometimes, git will prepend "heads/" infront of the branch name,
|
||||||
# remove this as it's not useful to us and causes ftp issues.
|
# remove this as it's not useful to us and causes ftp issues.
|
||||||
branch = re.sub("heads/", "", branch)
|
branch = re.sub("heads/", "", branch)
|
||||||
|
|
||||||
# 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 = "%s-%s" % (branch, revision)
|
replace = "%s-%s" % (branch, revision)
|
||||||
|
|
Loading…
Reference in New Issue