From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Sat, 23 Feb 2019 15:54:35 +0000 (+0000)
Subject: oeqa/utils/metadata: Add commit_count to fallback logic
X-Git-Tag: uninative-2.4~157
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=b8d22ed681141ce360d742a96cec5f2925a20222;p=openembedded-core.git

oeqa/utils/metadata: Add commit_count to fallback logic

Currently if python3-git isn't installed we can get odd behaviours when the
commit_count is absent. Avoid this set of bugs by adding a fallback here.

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 b7def77224..70a27569f2 100644
--- a/meta/lib/oeqa/utils/metadata.py
+++ b/meta/lib/oeqa/utils/metadata.py
@@ -72,8 +72,10 @@ def git_rev_info(path):
             info['commit'] = subprocess.check_output(["git", "rev-parse", "HEAD"], cwd=path).decode('utf-8').strip()
         except subprocess.CalledProcessError:
             pass
-        return info
-
+        try:
+            info['commit_count'] = int(subprocess.check_output(["git", "rev-list", "--count", "HEAD"], cwd=path).decode('utf-8').strip())
+        except subprocess.CalledProcessError:
+            pass
     try:
         repo = Repo(path, search_parent_directories=True)
     except (InvalidGitRepositoryError, NoSuchPathError):