From 7eb193fc4994b880ce115fc00fb52b4d9cda530e Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Fri, 23 Sep 2011 17:05:00 +0100 Subject: 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 Signed-off-by: Richard Purdie --- bitbake/lib/bb/build.py | 4 ++-- bitbake/lib/bb/msg.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'bitbake') 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): with open(runfile, 'w') as script: script.write('#!/bin/sh -e\n') - if bb.msg.loggerVerbose: + if bb.msg.loggerDefaultVerbose: script.write("set -x\n") data.emit_func(function, script, d) if cwd: @@ -234,7 +234,7 @@ def exec_func_shell(function, d, runfile, cwd=None): cmd = runfile - if bb.msg.loggerVerbose: + if bb.msg.loggerDefaultVerbose: logfile = LogTee(logger, sys.stdout) else: 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 = []): """ Set default verbosity and debug levels config the logger """ - bb.msg.loggerDebugLevel = debug - bb.msg.loggerVerbose = verbose + bb.msg.loggerDefaultDebugLevel = debug + bb.msg.loggerDefaultVerbose = verbose bb.msg.loggerDefaultDomains = debug_domains def addDefaultlogFilter(handler): -- cgit v1.2.3-54-g00ecf