diff options
| -rw-r--r-- | meta/lib/oeqa/utils/metadata.py | 2 | ||||
| -rwxr-xr-x | 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): | |||
| 74 | repo = Repo(layer, search_parent_directories=True) | 74 | repo = Repo(layer, search_parent_directories=True) |
| 75 | except (InvalidGitRepositoryError, NoSuchPathError): | 75 | except (InvalidGitRepositoryError, NoSuchPathError): |
| 76 | continue | 76 | continue |
| 77 | layer_dict[layer_name]['revision'] = repo.head.commit.hexsha | 77 | layer_dict[layer_name]['commit'] = repo.head.commit.hexsha |
| 78 | try: | 78 | try: |
| 79 | layer_dict[layer_name]['branch'] = repo.active_branch.name | 79 | layer_dict[layer_name]['branch'] = repo.active_branch.name |
| 80 | except TypeError: | 80 | 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(): | |||
| 631 | layer_info = '' | 631 | layer_info = '' |
| 632 | for layer, values in metadata['layers'].items(): | 632 | for layer, values in metadata['layers'].items(): |
| 633 | layer_info = '%s%-17s = %s:%s\n' % (layer_info, layer, | 633 | layer_info = '%s%-17s = %s:%s\n' % (layer_info, layer, |
| 634 | values.get('branch', '(nogit)'), values.get('revision', '0'*40)) | 634 | values.get('branch', '(nogit)'), values.get('commit', '0'*40)) |
| 635 | msg = 'Selftest for build %s of %s for machine %s on %s\n\n%s' % ( | 635 | msg = 'Selftest for build %s of %s for machine %s on %s\n\n%s' % ( |
| 636 | log_prefix[12:], metadata['distro']['pretty_name'], | 636 | log_prefix[12:], metadata['distro']['pretty_name'], |
| 637 | metadata['machine'], metadata['hostname'], layer_info) | 637 | metadata['machine'], metadata['hostname'], layer_info) |
