From 350c3126e130b1f6d22c6b5061a3feacc05025fc Mon Sep 17 00:00:00 2001
From: Chris Larson <chris_larson@mentor.com>
Date: Fri, 9 Apr 2010 19:27:21 -0700
Subject: Make the default domain a proper domain, not a string
This lets you do -l Default on the commandline to bump the debug level of
messages with no domain, without bumping the level of everything else.
(Bitbake rev: bef33dfc36713d8c93e38e63ddac2e4f9858e787)
Signed-off-by: Chris Larson <chris_larson@mentor.com>
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
---
bitbake/lib/bb/msg.py | 55 +++++++++++++++++++++++++++------------------------
1 file changed, 29 insertions(+), 26 deletions(-)
diff --git a/bitbake/lib/bb/msg.py b/bitbake/lib/bb/msg.py
index cf7931401..5fc1d5d4a 100644
--- a/bitbake/lib/bb/msg.py
+++ b/bitbake/lib/bb/msg.py
@@ -34,18 +34,19 @@ def _NamedTuple(name, fields):
return Tuple(*range(len(fields)))
domain = _NamedTuple("Domain",(
- 'Build',
- 'Cache',
- 'Collection',
- 'Data',
- 'Depends',
- 'Fetcher',
- 'Parsing',
- 'PersistData',
- 'Provider',
- 'RunQueue',
- 'TaskData',
- 'Util'))
+ "Default",
+ "Build",
+ "Cache",
+ "Collection",
+ "Data",
+ "Depends",
+ "Fetcher",
+ "Parsing",
+ "PersistData",
+ "Provider",
+ "RunQueue",
+ "TaskData",
+ "Util"))
class MsgBase(bb.event.Event):
@@ -80,13 +81,13 @@ class MsgPlain(MsgBase):
def set_debug_level(level):
for d in domain:
debug_level[d] = level
- debug_level['default'] = level
+ debug_level[domain.Default] = level
def set_verbose(level):
verbose = level
-def set_debug_domains(domain_strings):
- for domainstr in domain_strings:
+def set_debug_domains(msgdomainstrings):
+ for domainstr in msgdomainstrings:
for d in domain:
if domain._fields[d] == domainstr:
debug_level[d] += 1
@@ -98,33 +99,35 @@ def set_debug_domains(domain_strings):
# Message handling functions
#
-def debug(level, domain, msg, fn = None):
- if not domain:
- domain = 'default'
- if debug_level[domain] >= level:
+def debug(level, msgdomain, msg, fn = None):
+ if not msgdomain:
+ msgdomain = domain.Default
+
+ if debug_level[msgdomain] >= level:
bb.event.fire(MsgDebug(msg), None)
if not bb.event._ui_handlers:
print 'DEBUG: ' + msg
-def note(level, domain, msg, fn = None):
- if not domain:
- domain = 'default'
- if level == 1 or verbose or debug_level[domain] >= 1:
+def note(level, msgdomain, msg, fn = None):
+ if not msgdomain:
+ msgdomain = domain.Default
+
+ if level == 1 or verbose or debug_level[msgdomain] >= 1:
bb.event.fire(MsgNote(msg), None)
if not bb.event._ui_handlers:
print 'NOTE: ' + msg
-def warn(domain, msg, fn = None):
+def warn(msgdomain, msg, fn = None):
bb.event.fire(MsgWarn(msg), None)
if not bb.event._ui_handlers:
print 'WARNING: ' + msg
-def error(domain, msg, fn = None):
+def error(msgdomain, msg, fn = None):
bb.event.fire(MsgError(msg), None)
if not bb.event._ui_handlers:
print 'ERROR: ' + msg
-def fatal(domain, msg, fn = None):
+def fatal(msgdomain, msg, fn = None):
bb.event.fire(MsgFatal(msg), None)
if not bb.event._ui_handlers:
print 'FATAL: ' + msg
--
cgit v1.2.3