[PATCH 0/1] bitbake: fix -D and -v options v2

[PATCH 0/1] bitbake: fix -D and -v options v2

[Paul Eggleton]

A single patch to fix a regression in setting the debug/verbosity levels
(-D and -v command line options).

Since v1, fix some references to the loggerVerbose variable in build.py.

The patch (against Poky, but applies cleanly against bitbake master with 
-p2) is available in the git repository at: 
  git://git.pokylinux.org/poky-contrib paule/bb-debug
  http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=paule/bb-debug

Paul Eggleton (1):
  bitbake/lib/bb/msg.py: fix setting debug and verbosity levels

 bitbake/lib/bb/build.py |    4 ++--
 bitbake/lib/bb/msg.py   |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

-- 
1.7.4.1

[PATCH 1/1] bitbake/lib/bb/msg.py: fix setting debug and verbosity levels

[Paul Eggleton]

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].

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
 bitbake/lib/bb/build.py |    4 ++--
 bitbake/lib/bb/msg.py   |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/bitbake/lib/bb/build.py b/bitbake/lib/bb/build.py
index 00304b4..8937f08 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 b7ae761..20d9bdd 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):
-- 
1.7.4.1

Re: [PATCH 1/1] bitbake/lib/bb/msg.py: fix setting debug and verbosity levels

[Richard Purdie]

On Fri, 2011-09-23 at 17:05 +0100, Paul Eggleton wrote:
> 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].
> 
> Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
> ---
>  bitbake/lib/bb/build.py |    4 ++--
>  bitbake/lib/bb/msg.py   |    4 ++--
>  2 files changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/bitbake/lib/bb/build.py b/bitbake/lib/bb/build.py
> index 00304b4..8937f08 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 b7ae761..20d9bdd 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):

Merged to master, thanks.

Richard

Re: [PATCH 1/1] bitbake/lib/bb/msg.py: fix setting debug and verbosity levels

[Paul Eggleton]

On Friday 23 September 2011 13:43:02 Paul Eggleton wrote:
> 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 setting
> incorrect variable names.

Seems there are a couple of references to loggerVerbose, so ignore this; I 
will send a v2 shortly.

Cheers,
Paul

-- 

Paul Eggleton
Intel Open Source Technology Centre

[PATCH 1/1] bitbake/lib/bb/msg.py: fix setting debug and verbosity levels

[Paul Eggleton]

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 setting
incorrect variable names.

Fixes [YOCTO #1513].

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
 bitbake/lib/bb/msg.py |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bitbake/lib/bb/msg.py b/bitbake/lib/bb/msg.py
index b7ae761..20d9bdd 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):
-- 
1.7.4.1