diff options
author | Richard Purdie <rpurdie@linux.intel.com> | 2010-10-11 12:52:57 +0100 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-10-11 12:52:57 +0100 |
commit | ff539b11acca9831b72f3bc951a6ef20cd293786 (patch) | |
tree | d127343f934d16516f0feeebb76e17ea8164ce3e /bitbake/bin | |
parent | efe55d749ac0201d32587d94670fea46c8a98728 (diff) | |
download | poky-ff539b11acca9831b72f3bc951a6ef20cd293786.tar.gz |
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-x | bitbake/bin/bitbake-runtask | 19 |
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): | |||
16 | Manages build options and configurations for one run | 16 | Manages build options and configurations for one run |
17 | """ | 17 | """ |
18 | 18 | ||
19 | def __init__(self): | 19 | def __init__(self, debug, debug_domains): |
20 | setattr(self, "data", {}) | 20 | setattr(self, "data", {}) |
21 | setattr(self, "file", []) | 21 | setattr(self, "file", []) |
22 | setattr(self, "cmd", None) | 22 | setattr(self, "cmd", None) |
23 | setattr(self, "dump_signatures", True) | 23 | setattr(self, "dump_signatures", True) |
24 | setattr(self, "debug", debug) | ||
25 | setattr(self, "debug_domains", debug_domains) | ||
24 | 26 | ||
25 | _warnings_showwarning = warnings.showwarning | 27 | _warnings_showwarning = warnings.showwarning |
26 | def _showwarning(message, category, filename, lineno, file=None, line=None): | 28 | def _showwarning(message, category, filename, lineno, file=None, line=None): |
@@ -66,13 +68,19 @@ os.setpgrp() | |||
66 | bb.event.worker_pid = os.getpid() | 68 | bb.event.worker_pid = os.getpid() |
67 | bb.event.useStdout = False | 69 | bb.event.useStdout = False |
68 | 70 | ||
69 | import bb.cooker | ||
70 | |||
71 | cooker = bb.cooker.BBCooker(BBConfiguration(), None) | ||
72 | hashfile = sys.argv[1] | 71 | hashfile = sys.argv[1] |
73 | buildfile = sys.argv[2] | 72 | buildfile = sys.argv[2] |
74 | taskname = sys.argv[3] | 73 | taskname = sys.argv[3] |
75 | 74 | ||
75 | import bb.cooker | ||
76 | |||
77 | p = pickle.Unpickler(file(hashfile, "rb")) | ||
78 | hashdata = p.load() | ||
79 | |||
80 | debug = hashdata["msg-debug"] | ||
81 | debug_domains = hashdata["msg-debug-domains"] | ||
82 | cooker = bb.cooker.BBCooker(BBConfiguration(debug, debug_domains), None) | ||
83 | |||
76 | cooker.parseConfiguration() | 84 | cooker.parseConfiguration() |
77 | 85 | ||
78 | cooker.bb_cache = bb.cache.init(cooker) | 86 | cooker.bb_cache = bb.cache.init(cooker) |
@@ -92,9 +100,6 @@ cooker.bb_cache.handle_data(fn, cooker.status) | |||
92 | if taskname.endswith("_setscene"): | 100 | if taskname.endswith("_setscene"): |
93 | the_data.setVarFlag(taskname, "quieterrors", "1") | 101 | the_data.setVarFlag(taskname, "quieterrors", "1") |
94 | 102 | ||
95 | p = pickle.Unpickler(file(hashfile, "rb")) | ||
96 | hashdata = p.load() | ||
97 | |||
98 | bb.parse.siggen.set_taskdata(hashdata["hashes"], hashdata["deps"]) | 103 | bb.parse.siggen.set_taskdata(hashdata["hashes"], hashdata["deps"]) |
99 | 104 | ||
100 | for h in hashdata["hashes"]: | 105 | for h in hashdata["hashes"]: |