diff options
-rw-r--r-- | meta/lib/oeqa/utils/metadata.py | 7 | ||||
-rwxr-xr-x | scripts/oe-selftest | 4 |
2 files changed, 5 insertions, 6 deletions
diff --git a/meta/lib/oeqa/utils/metadata.py b/meta/lib/oeqa/utils/metadata.py index df6ed91052..a389c6a28e 100644 --- a/meta/lib/oeqa/utils/metadata.py +++ b/meta/lib/oeqa/utils/metadata.py | |||
@@ -73,11 +73,10 @@ def get_layers(layers): | |||
73 | try: | 73 | try: |
74 | repo = Repo(layer, search_parent_directories=True) | 74 | repo = Repo(layer, search_parent_directories=True) |
75 | revision, branch = repo.head.object.name_rev.split() | 75 | revision, branch = repo.head.object.name_rev.split() |
76 | layer_dict[layer_name]['branch'] = branch | ||
77 | layer_dict[layer_name]['revision'] = revision | ||
78 | except (InvalidGitRepositoryError, NoSuchPathError): | 76 | except (InvalidGitRepositoryError, NoSuchPathError): |
79 | layer_dict[layer_name]['branch'] = 'unknown' | 77 | continue |
80 | layer_dict[layer_name]['revision'] = 'unknown' | 78 | layer_dict[layer_name]['branch'] = branch |
79 | layer_dict[layer_name]['revision'] = revision | ||
81 | return layer_dict | 80 | return layer_dict |
82 | 81 | ||
83 | def write_metadata_file(file_path, metadata): | 82 | def write_metadata_file(file_path, metadata): |
diff --git a/scripts/oe-selftest b/scripts/oe-selftest index c3c491f20a..78806a6a22 100755 --- a/scripts/oe-selftest +++ b/scripts/oe-selftest | |||
@@ -603,7 +603,7 @@ def main(): | |||
603 | r_branches = set(r_branches.replace('origin/', '').split()) | 603 | r_branches = set(r_branches.replace('origin/', '').split()) |
604 | l_branches = {str(branch) for branch in repo.branches} | 604 | l_branches = {str(branch) for branch in repo.branches} |
605 | branch = '%s/%s/%s' % (metadata['hostname'], | 605 | branch = '%s/%s/%s' % (metadata['hostname'], |
606 | metadata['layers']['meta']['branch'], | 606 | metadata['layers']['meta'].get('branch', '(nogit)'), |
607 | metadata['machine']) | 607 | metadata['machine']) |
608 | 608 | ||
609 | if branch in l_branches: | 609 | if branch in l_branches: |
@@ -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['branch'], values['revision']) | 634 | values.get('branch', '(nogit)'), values.get('revision', '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) |