Adapt bits to the new way of handling the debug level.

diff --git a/classes/base.bbclass b/classes/base.bbclass
index c4e81fa..f319676 100644 (file)
--- 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 fc232bf..df4dfb5 100644 (file)
--- 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