[oe-commits] [openembedded-core] 22/59: metadata_scm.bbclass: simplify base_detect_revision()

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit df1df24831610f1551937a88676efc5609112735
Author: Robert Yang <liezhi.yang at windriver.com>
AuthorDate: Wed Nov 7 18:02:37 2018 +0800

    metadata_scm.bbclass: simplify base_detect_revision()
    
    The previous code looks strange because of historical reason, simply return
    base_get_metadata_git_revision/branch() is enough, the later functions has
    handled everything like '<unknown>' and strip().
    
    Signed-off-by: Robert Yang <liezhi.yang at windriver.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 meta/classes/metadata_scm.bbclass | 20 ++------------------
 1 file changed, 2 insertions(+), 18 deletions(-)

diff --git a/meta/classes/metadata_scm.bbclass b/meta/classes/metadata_scm.bbclass
index fa791f0..658e2f8 100644
--- a/meta/classes/metadata_scm.bbclass
+++ b/meta/classes/metadata_scm.bbclass
@@ -3,27 +3,11 @@ METADATA_REVISION ?= "${@base_detect_revision(d)}"
 
 def base_detect_revision(d):
     path = base_get_scmbasepath(d)
-
-    scms = [base_get_metadata_git_revision]
-
-    for scm in scms:
-        rev = scm(path, d)
-        if rev != "<unknown>":
-            return rev
-
-    return "<unknown>"
+    return base_get_metadata_git_revision(path, d)
 
 def base_detect_branch(d):
     path = base_get_scmbasepath(d)
-
-    scms = [base_get_metadata_git_branch]
-
-    for scm in scms:
-        rev = scm(path, d)
-        if rev != "<unknown>":
-            return rev.strip()
-
-    return "<unknown>"
+    return base_get_metadata_git_branch(path, d)
 
 def base_get_scmbasepath(d):
     return os.path.join(d.getVar('COREBASE'), 'meta')

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.