From bd8ff33cf2439536c6e41cf0ee9dd8fb3b64770a Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Tue, 13 Oct 2015 15:52:20 +0100 Subject: metadata_scm: rewrite git hash logic The code to get the git and branch hash for the current commit in a specific repository was quite complex and prone to breakage, replace it with subprocess and git rev-parse. Signed-off-by: Ross Burton --- meta/classes/metadata_scm.bbclass | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/meta/classes/metadata_scm.bbclass b/meta/classes/metadata_scm.bbclass index 237e61821d..64465faa4c 100644 --- a/meta/classes/metadata_scm.bbclass +++ b/meta/classes/metadata_scm.bbclass @@ -65,18 +65,19 @@ def base_get_metadata_svn_revision(path, d): return revision def base_get_metadata_git_branch(path, d): - branch = os.popen('cd %s; git branch 2>&1 | grep "^* " | tr -d "* "' % path).read() + import subprocess - if len(branch) != 0: - return branch - return "" + try: + return subprocess.check_output(["git", "rev-parse", "--abbrev-ref", "HEAD"], + cwd=path).strip() + except: + return "" def base_get_metadata_git_revision(path, d): - f = os.popen("cd %s; git log -n 1 --pretty=oneline -- 2>&1" % path) - data = f.read() - if f.close() is None: - rev = data.split(" ")[0] - if len(rev) != 0: - return rev - return "" + import subprocess + try: + return subprocess.check_output(["git", "rev-parse", "HEAD"], + cwd=path).strip() + except: + return "" -- cgit 1.2.3-korg