summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2011-09-23 17:05:00 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-09-26 19:35:58 +0100
commit7eb193fc4994b880ce115fc00fb52b4d9cda530e (patch)
tree7bc3f77043e251ead9a0b283e5fcb16daedbc985
parent4aa6a8e9a66d7e7ea859ae40cb69a65cd95f4911 (diff)
downloadpoky-7eb193fc4994b880ce115fc00fb52b4d9cda530e.tar.gz
bitbake/lib/bb/msg.py: fix setting debug and verbosity levels
The debug and verbosity levels (as set by the -D and -v command line options respectively) were not being passed through within msg.py since bitbake revision 45aad2f9647df14bcfa5e755b57e1ddab377939a due to incorrect variable names. Fixes [YOCTO #1513]. (Bitbake rev: c6e88b7c0e61f9586a275df53f48b90687c5f92f) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--bitbake/lib/bb/build.py4
-rw-r--r--bitbake/lib/bb/msg.py4
2 files changed, 4 insertions, 4 deletions
diff --git a/bitbake/lib/bb/build.py b/bitbake/lib/bb/build.py
index 00304b4e62..8937f083a1 100644
--- a/bitbake/lib/bb/build.py
+++ b/bitbake/lib/bb/build.py
@@ -223,7 +223,7 @@ def exec_func_shell(function, d, runfile, cwd=None):
223 223
224 with open(runfile, 'w') as script: 224 with open(runfile, 'w') as script:
225 script.write('#!/bin/sh -e\n') 225 script.write('#!/bin/sh -e\n')
226 if bb.msg.loggerVerbose: 226 if bb.msg.loggerDefaultVerbose:
227 script.write("set -x\n") 227 script.write("set -x\n")
228 data.emit_func(function, script, d) 228 data.emit_func(function, script, d)
229 if cwd: 229 if cwd:
@@ -234,7 +234,7 @@ def exec_func_shell(function, d, runfile, cwd=None):
234 234
235 cmd = runfile 235 cmd = runfile
236 236
237 if bb.msg.loggerVerbose: 237 if bb.msg.loggerDefaultVerbose:
238 logfile = LogTee(logger, sys.stdout) 238 logfile = LogTee(logger, sys.stdout)
239 else: 239 else:
240 logfile = sys.stdout 240 logfile = sys.stdout
diff --git a/bitbake/lib/bb/msg.py b/bitbake/lib/bb/msg.py
index b7ae761e4e..20d9bdd726 100644
--- a/bitbake/lib/bb/msg.py
+++ b/bitbake/lib/bb/msg.py
@@ -106,8 +106,8 @@ def init_msgconfig(verbose, debug, debug_domains = []):
106 """ 106 """
107 Set default verbosity and debug levels config the logger 107 Set default verbosity and debug levels config the logger
108 """ 108 """
109 bb.msg.loggerDebugLevel = debug 109 bb.msg.loggerDefaultDebugLevel = debug
110 bb.msg.loggerVerbose = verbose 110 bb.msg.loggerDefaultVerbose = verbose
111 bb.msg.loggerDefaultDomains = debug_domains 111 bb.msg.loggerDefaultDomains = debug_domains
112 112
113def addDefaultlogFilter(handler): 113def addDefaultlogFilter(handler):