bitbake: fix -D and -v options v2

PATCH Applied Paul Eggleton 2 participants 3 messages Sep 23, 2011 – Sep 25, 2011

lore

Share & tools

lore

Paul Eggleton

author

2011-09-23 16:10 UTC #0 lore raw

cover bitbake: fix -D and -v options v2

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(-)

Signature · 1 line

1.7.4.1

Paul Eggleton

author

2011-09-23 16:10 UTC #1 lore raw

PATCH 1/1 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].

Signed-off-by Paul Eggleton <[email protected]>

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

bitbake/lib/bb/build.py +2 -2

index 00304b4..8937f08 100644
@@ -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

bitbake/lib/bb/msg.py +2 -2

index b7ae761..20d9bdd 100644
@@ -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):

Signature · 1 line

1.7.4.1

Richard Purdie

Applied

2011-09-25 15:31 UTC #2 lore raw

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

Quoted 40 lines · Paul Eggleton

Fixes [YOCTO #1513].

Signed-off-by Paul Eggleton <[email protected]>

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

bitbake/lib/bb/build.py +2 -2

index 00304b4..8937f08 100644
@@ -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

bitbake/lib/bb/msg.py +0 -0

index b7ae761..20d9bdd 100644

bitbake/lib/bb/msg.py def init_msgconfig(verbose, debug, debug_domains = []): · line 113

Quoted 10 lines

bitbake/lib/bb/msg.py +2 -2

@@ -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