diff options
| author | Holger Hans Peter Freyther <zecke@selfish.org> | 2008-11-15 18:23:17 +0100 |
|---|---|---|
| committer | Holger Hans Peter Freyther <zecke@selfish.org> | 2008-11-15 18:23:17 +0100 |
| commit | a25da5c491ac2a3820be7aaa7fa507fe7ca8b354 (patch) | |
| tree | d8162d4d8d6aaf5f129e203b6bc9d3ccead522f7 /classes/base.bbclass | |
| parent | 9e167064390ce3bff7425be5c002ed3f1e7eb1d1 (diff) | |
| parent | 828ced10e6eaf2048a8fd7ee7263807fab9d784d (diff) | |
Merge commit 'origin/org.openembedded.dev' into holger/openmoko-merges
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 93a76aa30f..10648e9885 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -758,7 +758,7 @@ def base_get_metadata_svn_revision(d): def base_get_metadata_git_branch(d): import os - branch = os.popen('cd %s; git-branch | grep "^* " | tr -d "* "' % base_get_scmbasepath(d)).read() + branch = os.popen('cd %s; git branch | grep "^* " | tr -d "* "' % base_get_scmbasepath(d)).read() if len(branch) != 0: return branch @@ -766,7 +766,7 @@ def base_get_metadata_git_branch(d): def base_get_metadata_git_revision(d): import os - rev = os.popen("cd %s; git-log -n 1 --pretty=oneline --" % base_get_scmbasepath(d)).read().split(" ")[0] + rev = os.popen("cd %s; git log -n 1 --pretty=oneline --" % base_get_scmbasepath(d)).read().split(" ")[0] if len(rev) != 0: return rev return "<unknown>" |