summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Wood <michael.g.wood@intel.com>2015-09-28 21:45:28 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-09-29 14:11:38 +0100
commitaed6d2e8c04bad9e1bf1e89e5bc663ae6afb80d9 (patch)
tree93c44dff6d9eb73826bd106f23806bb7f7821a09
parent922503f4c1d664edc5d3c0f66f262b3b4c3e5c56 (diff)
downloadpoky-aed6d2e8c04bad9e1bf1e89e5bc663ae6afb80d9.tar.gz
bitbake: toaster: Prioroitise the layer more generic vcs reference over the sha
When we do a build we update the last commit value that the layer was built at However in future builds we do want to use the named reference rather than the commit sha, e.g. master/fido (Bitbake rev: a3d47eb923dd2cb5259f387c79549822807eca49) Signed-off-by: Michael Wood <michael.g.wood@intel.com> Signed-off-by: brian avery <avery.brian@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--bitbake/lib/toaster/orm/models.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/bitbake/lib/toaster/orm/models.py b/bitbake/lib/toaster/orm/models.py
index 8d7388e2e6..e0b31a92c4 100644
--- a/bitbake/lib/toaster/orm/models.py
+++ b/bitbake/lib/toaster/orm/models.py
@@ -1155,12 +1155,12 @@ class Layer_Version(models.Model):
1155 return project.compatible_layerversions(layer_name = self.layer.name) 1155 return project.compatible_layerversions(layer_name = self.layer.name)
1156 1156
1157 def get_vcs_reference(self): 1157 def get_vcs_reference(self):
1158 if self.commit is not None and len(self.commit) > 0:
1159 return self.commit
1160 if self.branch is not None and len(self.branch) > 0: 1158 if self.branch is not None and len(self.branch) > 0:
1161 return self.branch 1159 return self.branch
1162 if self.up_branch is not None: 1160 if self.up_branch is not None:
1163 return self.up_branch.name 1161 return self.up_branch.name
1162 if self.commit is not None and len(self.commit) > 0:
1163 return self.commit
1164 return ("Cannot determine the vcs_reference for layer version %s" % vars(self)) 1164 return ("Cannot determine the vcs_reference for layer version %s" % vars(self))
1165 1165
1166 def get_detailspage_url(self, project_id): 1166 def get_detailspage_url(self, project_id):