summaryrefslogtreecommitdiffstats
path: root/meta/lib/oeqa/utils
diff options
context:
space:
mode:
authorMarkus Lehtonen <markus.lehtonen@linux.intel.com>2017-01-13 15:12:39 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-01-19 22:47:22 +0000
commit4e67232f345a8756f20c6dc41a52e5c80533598c (patch)
treef71cd2b35047c2cc09ee4657d9f83f95a531c66a /meta/lib/oeqa/utils
parentdf8c0540e4b3d01fa1dcb4a569b1b1282686d60a (diff)
downloadpoky-4e67232f345a8756f20c6dc41a52e5c80533598c.tar.gz
oeqa.utils.metadata: drop 'unknown' git data elements
It's better just to not have the xml elements than to have elements with faux data. One could have git branch named 'unknown', for example. [YOCTO #10590] (From OE-Core rev: fce531c21f5e56d0f416b3405a0b0fc5ba567679) 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>
Diffstat (limited to 'meta/lib/oeqa/utils')
-rw-r--r--meta/lib/oeqa/utils/metadata.py7
1 files changed, 3 insertions, 4 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
83def write_metadata_file(file_path, metadata): 82def write_metadata_file(file_path, metadata):