From: Chris Larson <clarson@mvista.com>
Date: Mon, 23 Mar 2009 22:40:22 +0000 (-0700)
Subject: base.bbclass: rstrip the git branch/revision.
X-Git-Tag: Release-2010-05/1~3796^2~50
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6ddd16d877b167b929b5a64a2e01d2e6be161b15;p=openembedded.git

base.bbclass: rstrip the git branch/revision.

Signed-off-by: Chris Larson <clarson@mvista.com>
---

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>"