From 3eeb029c4b3b85468a7568f7d51fd637b9d8960c Mon Sep 17 00:00:00 2001 From: Robert Yang Date: Wed, 7 Nov 2018 17:33:26 +0800 Subject: 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 '' and strip(). Signed-off-by: Robert Yang --- 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 fa791f04c4..658e2f883b 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 != "": - return rev - - return "" + 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 != "": - return rev.strip() - - return "" + return base_get_metadata_git_branch(path, d) def base_get_scmbasepath(d): return os.path.join(d.getVar('COREBASE'), 'meta') -- cgit 1.2.3-korg