diff options
author | Chris Larson <chris_larson@mentor.com> | 2010-06-10 10:35:31 -0700 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2011-01-04 14:46:33 +0000 |
commit | ecc68fa4fbb579e97ea45156e79a293b073697a0 (patch) | |
tree | 6d08682e43476e37ccf48ee14c8d81e208d1c897 /bitbake/lib/bb/parse/parse_py | |
parent | d3a45c7d41a88d79389fc40eb68816e4939fb6f9 (diff) | |
download | poky-ecc68fa4fbb579e97ea45156e79a293b073697a0.tar.gz |
Switch bitbake internals to use logging directly rather than bb.msg
We use a custom Logger subclass for our loggers
This logger provides:
- 'debug' method which accepts a debug level
- 'plain' method which bypasses log formatting
- 'verbose' method which is more detail than info, but less than debug
(Bitbake rev: 3b2c1fe5ca56daebb24073a9dd45723d3efd2a8d)
Signed-off-by: Chris Larson <chris_larson@mentor.com>
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'bitbake/lib/bb/parse/parse_py')
-rw-r--r-- | bitbake/lib/bb/parse/parse_py/BBHandler.py | 9 | ||||
-rw-r--r-- | bitbake/lib/bb/parse/parse_py/ConfHandler.py | 5 |
2 files changed, 8 insertions, 6 deletions
diff --git a/bitbake/lib/bb/parse/parse_py/BBHandler.py b/bitbake/lib/bb/parse/parse_py/BBHandler.py index 51ad10fb92..31f44f7df3 100644 --- a/bitbake/lib/bb/parse/parse_py/BBHandler.py +++ b/bitbake/lib/bb/parse/parse_py/BBHandler.py | |||
@@ -27,11 +27,12 @@ | |||
27 | 27 | ||
28 | from __future__ import absolute_import | 28 | from __future__ import absolute_import |
29 | import re, bb, os | 29 | import re, bb, os |
30 | import logging | ||
30 | import bb.fetch, bb.build, bb.utils | 31 | import bb.fetch, bb.build, bb.utils |
31 | from bb import data | 32 | from bb import data |
32 | 33 | ||
33 | from . import ConfHandler | 34 | from . import ConfHandler |
34 | from .. import resolve_file, ast | 35 | from .. import resolve_file, ast, logger |
35 | from .ConfHandler import include, init | 36 | from .ConfHandler import include, init |
36 | 37 | ||
37 | # For compatibility | 38 | # For compatibility |
@@ -76,7 +77,7 @@ def inherit(files, d): | |||
76 | file = os.path.join('classes', '%s.bbclass' % file) | 77 | file = os.path.join('classes', '%s.bbclass' % file) |
77 | 78 | ||
78 | if not file in __inherit_cache: | 79 | if not file in __inherit_cache: |
79 | bb.msg.debug(2, bb.msg.domain.Parsing, "BB %s:%d: inheriting %s" % (fn, lineno, file)) | 80 | logger.log(logging.DEBUG -1, "BB %s:%d: inheriting %s", fn, lineno, file) |
80 | __inherit_cache.append( file ) | 81 | __inherit_cache.append( file ) |
81 | data.setVar('__inherit_cache', __inherit_cache, d) | 82 | data.setVar('__inherit_cache', __inherit_cache, d) |
82 | include(fn, file, d, "inherit") | 83 | include(fn, file, d, "inherit") |
@@ -115,9 +116,9 @@ def handle(fn, d, include): | |||
115 | 116 | ||
116 | 117 | ||
117 | if include == 0: | 118 | if include == 0: |
118 | bb.msg.debug(2, bb.msg.domain.Parsing, "BB " + fn + ": handle(data)") | 119 | logger.debug(2, "BB %s: handle(data)", fn) |
119 | else: | 120 | else: |
120 | bb.msg.debug(2, bb.msg.domain.Parsing, "BB " + fn + ": handle(data, include)") | 121 | logger.debug(2, "BB %s: handle(data, include)", fn) |
121 | 122 | ||
122 | (root, ext) = os.path.splitext(os.path.basename(fn)) | 123 | (root, ext) = os.path.splitext(os.path.basename(fn)) |
123 | base_name = "%s%s" % (root, ext) | 124 | base_name = "%s%s" % (root, ext) |
diff --git a/bitbake/lib/bb/parse/parse_py/ConfHandler.py b/bitbake/lib/bb/parse/parse_py/ConfHandler.py index 9128a2ef8f..2abd2fdc25 100644 --- a/bitbake/lib/bb/parse/parse_py/ConfHandler.py +++ b/bitbake/lib/bb/parse/parse_py/ConfHandler.py | |||
@@ -25,8 +25,9 @@ | |||
25 | # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. | 25 | # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. |
26 | 26 | ||
27 | import re, bb.data, os | 27 | import re, bb.data, os |
28 | import logging | ||
28 | import bb.utils | 29 | import bb.utils |
29 | from bb.parse import ParseError, resolve_file, ast | 30 | from bb.parse import ParseError, resolve_file, ast, logger |
30 | 31 | ||
31 | #__config_regexp__ = re.compile( r"(?P<exp>export\s*)?(?P<var>[a-zA-Z0-9\-_+.${}]+)\s*(?P<colon>:)?(?P<ques>\?)?=\s*(?P<apo>['\"]?)(?P<value>.*)(?P=apo)$") | 32 | #__config_regexp__ = re.compile( r"(?P<exp>export\s*)?(?P<var>[a-zA-Z0-9\-_+.${}]+)\s*(?P<colon>:)?(?P<ques>\?)?=\s*(?P<apo>['\"]?)(?P<value>.*)(?P=apo)$") |
32 | __config_regexp__ = re.compile( r"(?P<exp>export\s*)?(?P<var>[a-zA-Z0-9\-_+.${}/]+)(\[(?P<flag>[a-zA-Z0-9\-_+.]+)\])?\s*((?P<colon>:=)|(?P<lazyques>\?\?=)|(?P<ques>\?=)|(?P<append>\+=)|(?P<prepend>=\+)|(?P<predot>=\.)|(?P<postdot>\.=)|=)\s*(?P<apo>['\"]?)(?P<value>.*)(?P=apo)$") | 33 | __config_regexp__ = re.compile( r"(?P<exp>export\s*)?(?P<var>[a-zA-Z0-9\-_+.${}/]+)(\[(?P<flag>[a-zA-Z0-9\-_+.]+)\])?\s*((?P<colon>:=)|(?P<lazyques>\?\?=)|(?P<ques>\?=)|(?P<append>\+=)|(?P<prepend>=\+)|(?P<predot>=\.)|(?P<postdot>\.=)|=)\s*(?P<apo>['\"]?)(?P<value>.*)(?P=apo)$") |
@@ -68,7 +69,7 @@ def include(oldfn, fn, data, error_out): | |||
68 | except IOError: | 69 | except IOError: |
69 | if error_out: | 70 | if error_out: |
70 | raise ParseError("Could not %(error_out)s file %(fn)s" % vars() ) | 71 | raise ParseError("Could not %(error_out)s file %(fn)s" % vars() ) |
71 | bb.msg.debug(2, bb.msg.domain.Parsing, "CONF file '%s' not found" % fn) | 72 | logger.debug(2, "CONF file '%s' not found", fn) |
72 | 73 | ||
73 | def handle(fn, data, include): | 74 | def handle(fn, data, include): |
74 | init(data) | 75 | init(data) |