diff options
author | Robert Yang <liezhi.yang@windriver.com> | 2018-11-07 18:02:37 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-11-13 15:18:28 +0000 |
commit | 8a6e70960e021e10a1d02e20e0519fdbdeac8616 (patch) | |
tree | 3db166d9ada432c5c7e700087260559150d4e8a0 /meta | |
parent | 5e3e30446b6abd98d1d3e9bee818203a6a206634 (diff) | |
download | openembedded-core-contrib-8a6e70960e021e10a1d02e20e0519fdbdeac8616.tar.gz |
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@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/classes/metadata_scm.bbclass | 20 |
1 files 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 != "<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') |