[gnome-continuous-yocto/gnomeostree-3.28-rocko: 6547/8267] bitbake: toaster: test 'commit' first in get_vcs_reference

[Emmanuele Bassi <ebassi src gnome org>]

commit b4b2e6d4dfa4bac7aec100bae4bca36e371e4ed9
Author: David Reyna <David Reyna windriver com>
Date:   Tue Jun 27 13:44:32 2017 -0700

    bitbake: toaster: test 'commit' first in get_vcs_reference
    
    The 'commit' value should be tested and used first when resolving the ref
    for a layer, since that is an explicit override in each layer index
    'layeritem' record. If should take precedence over more-global 'branch'
    and 'release' values, instead of being last.
    
    [YOCTO #11515]
    
    (Bitbake rev: b303365ca3a1ba5fb8c6839180f1ec26df60c6ce)
    
    Signed-off-by: David Reyna <David Reyna windriver com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 bitbake/lib/toaster/orm/models.py |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/bitbake/lib/toaster/orm/models.py b/bitbake/lib/toaster/orm/models.py
index 5c14727..630e4a0 100644
--- a/bitbake/lib/toaster/orm/models.py
+++ b/bitbake/lib/toaster/orm/models.py
@@ -1516,12 +1516,12 @@ class Layer_Version(models.Model):
         return self._handle_url_path(self.layer.vcs_web_tree_base_url, '')
 
     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.release is not None:
             return self.release.name
-        if self.commit is not None and len(self.commit) > 0:
-            return self.commit
         return 'N/A'
 
     def get_detailspage_url(self, project_id=None):