diff options
| author |   Paul Eggleton <paul.eggleton@linux.intel.com> | 2013-09-04 19:46:58 +0100 |
|---|---|---|
| committer | Paul Eggleton <paul.eggleton@linux.intel.com> | 2013-09-05 00:31:23 +0100 |
| commit | 157e377d00c3949576867c537af1297c56139fbd (patch) | |
| tree | 8a575909dd3d047038170d883024768c236c72f4 /layerindex/models.py | |
| parent | c567b7f4f4aeecc3c4725dabc72ab8a3cdcec975 (diff) | |
| download | openembedded-core-contrib-157e377d00c3949576867c537af1297c56139fbd.tar.gz | |
Use actual_branch in URLs if available
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Diffstat (limited to 'layerindex/models.py')
| -rw-r--r-- | layerindex/models.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/layerindex/models.py b/layerindex/models.py index 936b505428..5e38285eda 100644 --- a/layerindex/models.py +++ b/layerindex/models.py @@ -135,7 +135,11 @@ class LayerBranch(models.Model): extra_path = self.vcs_subdir else: 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 extra_path: url = re.sub(r'\[([^\]]*%path%[^\]]*)\]', '\\1', url) |