summaryrefslogtreecommitdiff
path: root/bitbake/bin
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2010-10-11 12:52:57 +0100
committerRichard Purdie <rpurdie@linux.intel.com>2010-10-11 12:52:57 +0100
commitff539b11acca9831b72f3bc951a6ef20cd293786 (patch)
treed127343f934d16516f0feeebb76e17ea8164ce3e /bitbake/bin
parentefe55d749ac0201d32587d94670fea46c8a98728 (diff)
downloadopenembedded-core-ff539b11acca9831b72f3bc951a6ef20cd293786.tar.gz
openembedded-core-ff539b11acca9831b72f3bc951a6ef20cd293786.tar.bz2
openembedded-core-ff539b11acca9831b72f3bc951a6ef20cd293786.zip
bitbake-runtask: Ensure logging options are inherited from the parent
[BUGID #291] Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'bitbake/bin')
-rwxr-xr-xbitbake/bin/bitbake-runtask19
1 files changed, 12 insertions, 7 deletions
diff --git a/bitbake/bin/bitbake-runtask b/bitbake/bin/bitbake-runtask
index 53049b83a4..3b37853f06 100755
--- a/bitbake/bin/bitbake-runtask
+++ b/bitbake/bin/bitbake-runtask
@@ -16,11 +16,13 @@ class BBConfiguration(object):
Manages build options and configurations for one run
"""
- def __init__(self):
+ def __init__(self, debug, debug_domains):
setattr(self, "data", {})
setattr(self, "file", [])
setattr(self, "cmd", None)
setattr(self, "dump_signatures", True)
+ setattr(self, "debug", debug)
+ setattr(self, "debug_domains", debug_domains)
_warnings_showwarning = warnings.showwarning
def _showwarning(message, category, filename, lineno, file=None, line=None):
@@ -66,13 +68,19 @@ os.setpgrp()
bb.event.worker_pid = os.getpid()
bb.event.useStdout = False
-import bb.cooker
-
-cooker = bb.cooker.BBCooker(BBConfiguration(), None)
hashfile = sys.argv[1]
buildfile = sys.argv[2]
taskname = sys.argv[3]
+import bb.cooker
+
+p = pickle.Unpickler(file(hashfile, "rb"))
+hashdata = p.load()
+
+debug = hashdata["msg-debug"]
+debug_domains = hashdata["msg-debug-domains"]
+cooker = bb.cooker.BBCooker(BBConfiguration(debug, debug_domains), None)
+
cooker.parseConfiguration()
cooker.bb_cache = bb.cache.init(cooker)
@@ -92,9 +100,6 @@ cooker.bb_cache.handle_data(fn, cooker.status)
if taskname.endswith("_setscene"):
the_data.setVarFlag(taskname, "quieterrors", "1")
-p = pickle.Unpickler(file(hashfile, "rb"))
-hashdata = p.load()
-
bb.parse.siggen.set_taskdata(hashdata["hashes"], hashdata["deps"])
for h in hashdata["hashes"]: