From 66e1b520d77f9c7512b7f1cf920cf9bea8d3ce3e Mon Sep 17 00:00:00 2001 From: Alexandru DAMIAN Date: Thu, 8 Jan 2015 13:15:13 +0000 Subject: bitbake: toaster: branch name priority resolution Adding a Layer_Version function that gets back the branch name that should be used/displayed for finding the targeted git branch name. Change the commit id to use the branch name instead of the last-updated commit hash from the layer source. [YOCTO #7031] (Bitbake rev: 1a52202f7f3719f5421289aaf0fc8eba0bf4c7ce) Signed-off-by: Alexandru DAMIAN Signed-off-by: Richard Purdie --- bitbake/lib/toaster/orm/models.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'bitbake') diff --git a/bitbake/lib/toaster/orm/models.py b/bitbake/lib/toaster/orm/models.py index 6fbbeed8f3..5eff955453 100644 --- a/bitbake/lib/toaster/orm/models.py +++ b/bitbake/lib/toaster/orm/models.py @@ -740,7 +740,7 @@ class LayerIndexLayerSource(LayerSource): lv.up_date = lbi['updated'] lv.up_branch = Branch.objects.get(layer_source = self, up_id = lbi['branch']) lv.branch = lbi['actual_branch'] - lv.commit = lbi['vcs_last_rev'] + lv.commit = lbi['actual_branch'] lv.dirpath = lbi['vcs_subdir'] lv.save() @@ -960,6 +960,12 @@ class Layer_Version(models.Model): key = lambda x: _get_ls_priority(x.layer_source), reverse = True) + def get_vcs_reference(self): + if self.commit is not None and len(self.commit) > 0: + return self.commit + if self.branch is not None and len(self.branch) > 0: + return self.branch + return self.up_branch.name def __unicode__(self): return str(self.layer) + " (" + self.commit +")" -- cgit v1.2.3-54-g00ecf