diff options
| author | Stefan Schmidt <stefan@datenfreihafen.org> | 2009-06-23 22:08:56 +0200 |
|---|---|---|
| committer | Stefan Schmidt <stefan@datenfreihafen.org> | 2009-06-23 22:08:56 +0200 |
| commit | 1edac611e10fb21b64f1eb1521a35e1e34dbd907 (patch) | |
| tree | 8f8f3cd8fd7f5c08af681cd74517d73f514282c5 /classes/base.bbclass | |
| parent | e3bf7220f003f0c0f60f648885f08652e19a0f13 (diff) | |
| parent | 007c2e2b948edc3a8896e1e93844c1211d03ac61 (diff) | |
Merge branch 'org.openembedded.dev' of git@git.openembedded.org:openembedded into org.openembedded.dev
Diffstat (limited to 'classes/base.bbclass')
| -rw-r--r-- | classes/base.bbclass | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/classes/base.bbclass b/classes/base.bbclass index e622aeec51..116605fff8 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -885,7 +885,7 @@ def base_get_metadata_svn_revision(path, d): def base_get_metadata_git_branch(path, d): import os - branch = os.popen('cd %s; git symbolic-ref HEAD' % path).read().rstrip() + branch = os.popen('cd %s; PATH=%s git symbolic-ref HEAD 2>/dev/null' % (path, d.getVar("BBPATH", 1))).read().rstrip() if len(branch) != 0: return branch.replace("refs/heads/", "") @@ -893,7 +893,7 @@ def base_get_metadata_git_branch(path, d): def base_get_metadata_git_revision(path, d): import os - rev = os.popen("cd %s; git show-ref HEAD" % path).read().split(" ")[0].rstrip() + rev = os.popen("cd %s; PATH=%s git show-ref HEAD 2>/dev/null" % (path, d.getVar("BBPATH", 1))).read().split(" ")[0].rstrip() if len(rev) != 0: return rev return "<unknown>" |