summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Larson <clarson@mvista.com>2009-03-23 15:40:22 -0700
committerChris Larson <clarson@mvista.com>2009-03-23 15:40:22 -0700
commit6ddd16d877b167b929b5a64a2e01d2e6be161b15 (patch)
tree6275381a3c7d45c70a25bcf2c18db0d07fd2de32
parent850ea31d59620b24ccb541743459ebc348f23498 (diff)
base.bbclass: rstrip the git branch/revision.
Signed-off-by: Chris Larson <clarson@mvista.com>
-rw-r--r--classes/base.bbclass4
1 files changed, 2 insertions, 2 deletions
diff --git a/classes/base.bbclass b/classes/base.bbclass
index 919d01d77b..9ec705bc1e 100644
--- a/classes/base.bbclass
+++ b/classes/base.bbclass
@@ -870,7 +870,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()
+ branch = os.popen('cd %s; git symbolic-ref HEAD' % path).read().rstrip()
if len(branch) != 0:
return branch.replace("refs/heads/", "")
@@ -878,7 +878,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]
+ rev = os.popen("cd %s; git show-ref HEAD" % path).read().split(" ")[0].rstrip()
if len(rev) != 0:
return rev
return "<unknown>"