[oe-commits] Koen Kooi : base bbclass: try to find the git binaries in PATH instead of BBPATH

git version control git at git.openembedded.org
Wed Jul 22 08:37:07 UTC 2009


Module: openembedded.git
Branch: org.openembedded.dev
Commit: 11f327a4705f281e32b44ebb401f6e6d5ad0211c
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=11f327a4705f281e32b44ebb401f6e6d5ad0211c

Author: Koen Kooi <koen at openembedded.org>
Date:   Wed Jul 22 10:28:45 2009 +0200

base bbclass: try to find the git binaries in PATH instead of BBPATH

* Also, how do I get the build banner back? This bug went unnoticed due to it being gone

---

 classes/base.bbclass |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/classes/base.bbclass b/classes/base.bbclass
index bc50c67..9c51c0a 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; PATH=%s git symbolic-ref HEAD 2>/dev/null' % (path, d.getVar("BBPATH", 1))).read().rstrip()
+	branch = os.popen('cd %s; PATH=%s git symbolic-ref HEAD 2>/dev/null' % (path, d.getVar("PATH", 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; PATH=%s git show-ref HEAD 2>/dev/null" % (path, d.getVar("BBPATH", 1))).read().split(" ")[0].rstrip()
+	rev = os.popen("cd %s; PATH=%s git show-ref HEAD 2>/dev/null" % (path, d.getVar("PATH", 1))).read().split(" ")[0].rstrip()
 	if len(rev) != 0:
 		return rev
 	return "<unknown>"





More information about the Openembedded-commits mailing list