summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/bb/parse/parse_py/ConfHandler.py
diff options
context:
space:
mode:
Diffstat (limited to 'bitbake/lib/bb/parse/parse_py/ConfHandler.py')
-rw-r--r--bitbake/lib/bb/parse/parse_py/ConfHandler.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/bitbake/lib/bb/parse/parse_py/ConfHandler.py b/bitbake/lib/bb/parse/parse_py/ConfHandler.py
index fbd75b14ad..b9712929f3 100644
--- a/bitbake/lib/bb/parse/parse_py/ConfHandler.py
+++ b/bitbake/lib/bb/parse/parse_py/ConfHandler.py
@@ -84,13 +84,13 @@ def include(parentfn, fn, lineno, data, error_out):
84 bbpath = "%s:%s" % (dname, data.getVar("BBPATH", True)) 84 bbpath = "%s:%s" % (dname, data.getVar("BBPATH", True))
85 abs_fn, attempts = bb.utils.which(bbpath, fn, history=True) 85 abs_fn, attempts = bb.utils.which(bbpath, fn, history=True)
86 if abs_fn and bb.parse.check_dependency(data, abs_fn): 86 if abs_fn and bb.parse.check_dependency(data, abs_fn):
87 logger.warn("Duplicate inclusion for %s in %s" % (abs_fn, data.getVar('FILE', True))) 87 logger.warning("Duplicate inclusion for %s in %s" % (abs_fn, data.getVar('FILE', True)))
88 for af in attempts: 88 for af in attempts:
89 bb.parse.mark_dependency(data, af) 89 bb.parse.mark_dependency(data, af)
90 if abs_fn: 90 if abs_fn:
91 fn = abs_fn 91 fn = abs_fn
92 elif bb.parse.check_dependency(data, fn): 92 elif bb.parse.check_dependency(data, fn):
93 logger.warn("Duplicate inclusion for %s in %s" % (fn, data.getVar('FILE', True))) 93 logger.warning("Duplicate inclusion for %s in %s" % (fn, data.getVar('FILE', True)))
94 94
95 try: 95 try:
96 bb.parse.handle(fn, data, True) 96 bb.parse.handle(fn, data, True)