sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

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]

(From OE-Core rev: a6521b89e86ddba6bd646dd3974d7b0390323b56)

Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Markus Lehtonen 2017-01-13 15:12:41 +02:00 committed by Richard Purdie
parent 927e759bb2
commit ceed2c7eb5
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
meta/lib/oeqa/utils/metadata.py
View File

@ -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:

2
scripts/oe-selftest
View File

@ -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)