summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/bb/parse/ast.py
diff options
context:
space:
mode:
Diffstat (limited to 'bitbake/lib/bb/parse/ast.py')
-rw-r--r--bitbake/lib/bb/parse/ast.py12
1 files changed, 8 insertions, 4 deletions
diff --git a/bitbake/lib/bb/parse/ast.py b/bitbake/lib/bb/parse/ast.py
index 870ae65b0e..55ab485990 100644
--- a/bitbake/lib/bb/parse/ast.py
+++ b/bitbake/lib/bb/parse/ast.py
@@ -23,9 +23,13 @@
23 23
24from __future__ import absolute_import 24from __future__ import absolute_import
25from future_builtins import filter 25from future_builtins import filter
26import bb, re, string 26import re
27from bb import methodpool 27import string
28import logging
29import bb
28import itertools 30import itertools
31from bb import methodpool
32from bb.parse import logger
29 33
30__word__ = re.compile(r"\S+") 34__word__ = re.compile(r"\S+")
31__parsed_methods__ = bb.methodpool.get_parsed_dict() 35__parsed_methods__ = bb.methodpool.get_parsed_dict()
@@ -51,7 +55,7 @@ class IncludeNode(AstNode):
51 Include the file and evaluate the statements 55 Include the file and evaluate the statements
52 """ 56 """
53 s = bb.data.expand(self.what_file, data) 57 s = bb.data.expand(self.what_file, data)
54 bb.msg.debug(3, bb.msg.domain.Parsing, "CONF %s:%d: including %s" % (self.from_fn, self.from_lineno, s)) 58 logger.debug(2, "CONF %s:%s: including %s", self.from_fn, self.from_lineno, s)
55 59
56 # TODO: Cache those includes... maybe not here though 60 # TODO: Cache those includes... maybe not here though
57 if self.force: 61 if self.force:
@@ -365,7 +369,7 @@ def _expand_versions(versions):
365def multi_finalize(fn, d): 369def multi_finalize(fn, d):
366 appends = (d.getVar("__BBAPPEND", True) or "").split() 370 appends = (d.getVar("__BBAPPEND", True) or "").split()
367 for append in appends: 371 for append in appends:
368 bb.msg.debug(2, bb.msg.domain.Parsing, "Appending .bbappend file " + append + " to " + fn) 372 logger.debug(2, "Appending .bbappend file %s to %s", append, fn)
369 bb.parse.BBHandler.handle(append, d, True) 373 bb.parse.BBHandler.handle(append, d, True)
370 374
371 safe_d = d 375 safe_d = d