aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Larson <clarson@kergoth.com>2004-12-09 12:04:45 +0000
committerChris Larson <clarson@kergoth.com>2004-12-09 12:04:45 +0000
commit034c2463b47ad09b92788e24b6ec5158ed14fdf3 (patch)
tree0eee4e990928338a655f9c62b03888f8e6aabd9d
parenta699538fcfbb08c520985cc4d8d1256fb89e2c32 (diff)
downloadbitbake-034c2463b47ad09b92788e24b6ec5158ed14fdf3.tar.gz
bitbake-034c2463b47ad09b92788e24b6ec5158ed14fdf3.tar.bz2
bitbake-034c2463b47ad09b92788e24b6ec5158ed14fdf3.zip
Adapt bits to the new way of handling the debug level.
-rw-r--r--classes/base.bbclass2
-rw-r--r--lib/bb/build.py6
2 files changed, 4 insertions, 4 deletions
diff --git a/classes/base.bbclass b/classes/base.bbclass
index c4e81fa7..f319676d 100644
--- a/classes/base.bbclass
+++ b/classes/base.bbclass
@@ -41,7 +41,7 @@ bbdebug() {
exit 1
}
- test ${BBDEBUG:-0} -ge $1 && {
+ test ${@bb.debug_level} -ge $1 && {
shift
echo "DEBUG:" $*
}
diff --git a/lib/bb/build.py b/lib/bb/build.py
index fc232bf7..df4dfb54 100644
--- a/lib/bb/build.py
+++ b/lib/bb/build.py
@@ -175,7 +175,7 @@ def exec_func_shell(func, d):
f = open(runfile, "w")
f.write("#!/bin/sh -e\n")
- if data.getVar("BBDEBUG", d): f.write("set -x\n")
+ if bb.debug_level > 0: f.write("set -x\n")
data.emit_env(f, d)
f.write("cd %s\n" % os.getcwd())
@@ -189,7 +189,7 @@ def exec_func_shell(func, d):
# open logs
si = file('/dev/null', 'r')
try:
- if data.getVar("BBDEBUG", d):
+ if bb.debug_level > 0:
so = os.popen("tee \"%s\"" % logfile, "w")
else:
so = file(logfile, 'w')
@@ -234,7 +234,7 @@ def exec_func_shell(func, d):
os.close(ose[0])
if ret==0:
- if not data.getVar("BBDEBUG", d):
+ if bb.debug_level > 0:
os.remove(runfile)
# os.remove(logfile)
return