From: Michael Wood Date: Tue, 29 Sep 2015 04:45:28 +0000 (-0700) Subject: toaster: Prioroitise the layer more generic vcs reference over the sha X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a3d47eb923dd2cb5259f387c79549822807eca49;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git 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 Signed-off-by: Michael Wood Signed-off-by: brian avery Signed-off-by: Richard Purdie --- diff --git a/lib/toaster/orm/models.py b/lib/toaster/orm/models.py index 8d7388e2e6b..e0b31a92c43 100644 --- a/lib/toaster/orm/models.py +++ b/lib/toaster/orm/models.py @@ -1155,12 +1155,12 @@ class Layer_Version(models.Model): return project.compatible_layerversions(layer_name = self.layer.name) 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 if self.up_branch is not None: return self.up_branch.name + if self.commit is not None and len(self.commit) > 0: + return self.commit return ("Cannot determine the vcs_reference for layer version %s" % vars(self)) def get_detailspage_url(self, project_id):