summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorChen Qi <Qi.Chen@windriver.com>2019-03-07 16:41:33 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-03-07 13:00:40 +0000
commitc8a0da63917302e699f59c612ffe2ab626f02952 (patch)
tree907909c3b307e90f75dad29c2b848d4df59500aa /meta
parente52a3085aa50e296dc8aef80fabd1b1d063977d5 (diff)
downloadpoky-c8a0da63917302e699f59c612ffe2ab626f02952.tar.gz
metadata.py: return info after fallback methods
If python3 git module is not installed, we fall back to some git command to get info. A previous commit (b8d22ed6) accidently deleted the return statement, causing errors like below. Exception: UnboundLocalError: local variable 'InvalidGitRepositoryError' referenced before assignment (From OE-Core rev: cd8aedc408afa4f8589f79e4d85befc7cac76ac6) Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/lib/oeqa/utils/metadata.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/meta/lib/oeqa/utils/metadata.py b/meta/lib/oeqa/utils/metadata.py
index 70a27569f2..e0808ae0ac 100644
--- a/meta/lib/oeqa/utils/metadata.py
+++ b/meta/lib/oeqa/utils/metadata.py
@@ -76,6 +76,7 @@ def git_rev_info(path):
76 info['commit_count'] = int(subprocess.check_output(["git", "rev-list", "--count", "HEAD"], cwd=path).decode('utf-8').strip()) 76 info['commit_count'] = int(subprocess.check_output(["git", "rev-list", "--count", "HEAD"], cwd=path).decode('utf-8').strip())
77 except subprocess.CalledProcessError: 77 except subprocess.CalledProcessError:
78 pass 78 pass
79 return info
79 try: 80 try:
80 repo = Repo(path, search_parent_directories=True) 81 repo = Repo(path, search_parent_directories=True)
81 except (InvalidGitRepositoryError, NoSuchPathError): 82 except (InvalidGitRepositoryError, NoSuchPathError):