diff options
| author | Joe Sauer <jsauer@vernier.com> | 2010-06-08 20:54:26 +0100 |
|---|---|---|
| committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-06-08 20:54:26 +0100 |
| commit | 47e5d86aad1ae96ba9c1af3ce5d7323e21b3f7fe (patch) | |
| tree | fb16707f917cf2ef4c820ce4c4d2c7766af39001 /meta | |
| parent | f47eeddbd692ac3c6109c18c9f04a3ad4dc789ba (diff) | |
| download | openembedded-core-47e5d86aad1ae96ba9c1af3ce5d7323e21b3f7fe.tar.gz openembedded-core-47e5d86aad1ae96ba9c1af3ce5d7323e21b3f7fe.tar.bz2 openembedded-core-47e5d86aad1ae96ba9c1af3ce5d7323e21b3f7fe.tar.xz openembedded-core-47e5d86aad1ae96ba9c1af3ce5d7323e21b3f7fe.zip | |
metadata_scm.bbclass: Make errors quiet if we're not in a git based scm
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/classes/metadata_scm.bbclass | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/classes/metadata_scm.bbclass b/meta/classes/metadata_scm.bbclass index 4f66011b0..b3c06dd7f 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 "<unknown>" 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 "<unknown>" |