From 47e5d86aad1ae96ba9c1af3ce5d7323e21b3f7fe Mon Sep 17 00:00:00 2001 From: Joe Sauer Date: Tue, 8 Jun 2010 20:54:26 +0100 Subject: metadata_scm.bbclass: Make errors quiet if we're not in a git based scm Signed-off-by: Richard Purdie --- meta/classes/metadata_scm.bbclass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'meta/classes/metadata_scm.bbclass') diff --git a/meta/classes/metadata_scm.bbclass b/meta/classes/metadata_scm.bbclass index 4f66011b0d..b3c06dd7f6 100644 --- a/meta/classes/metadata_scm.bbclass +++ b/meta/classes/metadata_scm.bbclass @@ -63,14 +63,14 @@ 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 | grep "^* " | tr -d "* "' % path).read() + branch = os.popen('cd %s; git branch 2>&1 | grep "^* " | tr -d "* "' % path).read() if len(branch) != 0: return branch return "" def base_get_metadata_git_revision(path, d): - rev = os.popen("cd %s; git log -n 1 --pretty=oneline --" % path).read().split(" ")[0] + rev = os.popen("cd %s; git log -n 1 --pretty=oneline -- 2>&1" % path).read().split(" ")[0] if len(rev) != 0: return rev return "" -- cgit v1.2.3-54-g00ecf