Use actual_branch in URLs if available

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
This commit is contained in:
Paul Eggleton 2013-09-04 19:46:58 +01:00
parent c567b7f4f4
commit 157e377d00

View File

@ -135,7 +135,11 @@ class LayerBranch(models.Model):
extra_path = self.vcs_subdir extra_path = self.vcs_subdir
else: else:
extra_path = path extra_path = path
url = base_url.replace('%branch%', self.branch.name) if self.actual_branch:
branchname = self.actual_branch
else:
branchname = self.branch.name
url = base_url.replace('%branch%', branchname)
if '%path%' in base_url: if '%path%' in base_url:
if extra_path: if extra_path:
url = re.sub(r'\[([^\]]*%path%[^\]]*)\]', '\\1', url) url = re.sub(r'\[([^\]]*%path%[^\]]*)\]', '\\1', url)