From: Chen Qi <Qi.Chen@windriver.com>
Date: Thu, 7 Mar 2019 08:41:33 +0000 (+0800)
Subject: metadata.py: return info after fallback methods
X-Git-Tag: uninative-2.4~78
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=cd8aedc408afa4f8589f79e4d85befc7cac76ac6;p=openembedded-core.git

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

Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

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):
             info['commit_count'] = int(subprocess.check_output(["git", "rev-list", "--count", "HEAD"], cwd=path).decode('utf-8').strip())
         except subprocess.CalledProcessError:
             pass
+        return info
     try:
         repo = Repo(path, search_parent_directories=True)
     except (InvalidGitRepositoryError, NoSuchPathError):