[OE-core] [PATCH v3 08/52] metadata_scm: rewrite git hash logic
Joshua Lock
joshua.lock at collabora.co.uk
Thu Oct 22 15:21:29 UTC 2015
From: Ross Burton <ross.burton at intel.com>
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 <ross.burton at intel.com>
---
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 237e618..64465fa 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 "<unknown>"
+ try:
+ return subprocess.check_output(["git", "rev-parse", "--abbrev-ref", "HEAD"],
+ cwd=path).strip()
+ except:
+ return "<unknown>"
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 "<unknown>"
+ import subprocess
+ try:
+ return subprocess.check_output(["git", "rev-parse", "HEAD"],
+ cwd=path).strip()
+ except:
+ return "<unknown>"
--
2.1.4
More information about the Openembedded-core
mailing list