[PATCH 0/1] metadata_scm.bbclass: simplify base_detect_revision()

[PATCH 0/1] metadata_scm.bbclass: simplify base_detect_revision()

[Robert Yang]

The following changes since commit 14b5854d50c38e94fc0d1ce6af36698fc69f52b4:

  xserver-xorg: fix CVE-2018-14665 (2018-11-01 13:27:17 +0000)

are available in the git repository at:

  git://git.openembedded.org/openembedded-core-contrib rbt/scm
  http://cgit.openembedded.org/openembedded-core-contrib/log/?h=rbt/scm

Robert Yang (1):
  metadata_scm.bbclass: simplify base_detect_revision()

 meta/classes/metadata_scm.bbclass | 20 ++------------------
 1 file changed, 2 insertions(+), 18 deletions(-)

-- 
2.7.4

[PATCH 1/1] metadata_scm.bbclass: simplify base_detect_revision()

[Robert Yang]

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@windriver.com>
---
 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')
-- 
2.7.4