summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkus Lehtonen <markus.lehtonen@linux.intel.com>2017-01-13 15:12:41 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-01-19 22:45:45 +0000
commita6521b89e86ddba6bd646dd3974d7b0390323b56 (patch)
tree7c6b120116c66a402f038448aab2ea3dc738ab7a
parent02d3ba17a8090bd088beb973980651d664f713bb (diff)
downloadopenembedded-core-contrib-a6521b89e86ddba6bd646dd3974d7b0390323b56.tar.gz
openembedded-core-contrib-a6521b89e86ddba6bd646dd3974d7b0390323b56.tar.bz2
openembedded-core-contrib-a6521b89e86ddba6bd646dd3974d7b0390323b56.zip
oeqa.utils.metadata: rename 'revision' to 'commit'
Revision is a bit vague and could point to a tag, for example. Git commit objects are unambiguous and persistent so be explicit that the element should contain git commit hash. [YOCTO #10590] Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
-rw-r--r--meta/lib/oeqa/utils/metadata.py2
-rwxr-xr-xscripts/oe-selftest2
2 files changed, 2 insertions, 2 deletions
diff --git a/meta/lib/oeqa/utils/metadata.py b/meta/lib/oeqa/utils/metadata.py
index b732d372df..2f7e8f2d08 100644
--- a/meta/lib/oeqa/utils/metadata.py
+++ b/meta/lib/oeqa/utils/metadata.py
@@ -74,7 +74,7 @@ def get_layers(layers):
repo = Repo(layer, search_parent_directories=True)
except (InvalidGitRepositoryError, NoSuchPathError):
continue
- layer_dict[layer_name]['revision'] = repo.head.commit.hexsha
+ layer_dict[layer_name]['commit'] = repo.head.commit.hexsha
try:
layer_dict[layer_name]['branch'] = repo.active_branch.name
except TypeError:
diff --git a/scripts/oe-selftest b/scripts/oe-selftest
index 78806a6a22..5b045e8672 100755
--- a/scripts/oe-selftest
+++ b/scripts/oe-selftest
@@ -631,7 +631,7 @@ def main():
layer_info = ''
for layer, values in metadata['layers'].items():
layer_info = '%s%-17s = %s:%s\n' % (layer_info, layer,
- values.get('branch', '(nogit)'), values.get('revision', '0'*40))
+ values.get('branch', '(nogit)'), values.get('commit', '0'*40))
msg = 'Selftest for build %s of %s for machine %s on %s\n\n%s' % (
log_prefix[12:], metadata['distro']['pretty_name'],
metadata['machine'], metadata['hostname'], layer_info)