From a6521b89e86ddba6bd646dd3974d7b0390323b56 Mon Sep 17 00:00:00 2001 From: Markus Lehtonen Date: Fri, 13 Jan 2017 15:12:41 +0200 Subject: 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 Signed-off-by: Ross Burton --- meta/lib/oeqa/utils/metadata.py | 2 +- scripts/oe-selftest | 2 +- 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) -- cgit 1.2.3-korg