diff options
Diffstat (limited to 'bitbake/lib/bb/parse')
-rw-r--r-- | bitbake/lib/bb/parse/parse_py/ConfHandler.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/bitbake/lib/bb/parse/parse_py/ConfHandler.py b/bitbake/lib/bb/parse/parse_py/ConfHandler.py index 978ebe4608..9d592f7261 100644 --- a/bitbake/lib/bb/parse/parse_py/ConfHandler.py +++ b/bitbake/lib/bb/parse/parse_py/ConfHandler.py | |||
@@ -66,21 +66,21 @@ def init(data): | |||
66 | def supports(fn, d): | 66 | def supports(fn, d): |
67 | return fn[-5:] == ".conf" | 67 | return fn[-5:] == ".conf" |
68 | 68 | ||
69 | def include(oldfn, fn, lineno, data, error_out): | 69 | def include(parentfn, fn, lineno, data, error_out): |
70 | """ | 70 | """ |
71 | error_out: A string indicating the verb (e.g. "include", "inherit") to be | 71 | error_out: A string indicating the verb (e.g. "include", "inherit") to be |
72 | used in a ParseError that will be raised if the file to be included could | 72 | used in a ParseError that will be raised if the file to be included could |
73 | not be included. Specify False to avoid raising an error in this case. | 73 | not be included. Specify False to avoid raising an error in this case. |
74 | """ | 74 | """ |
75 | if oldfn == fn: # prevent infinite recursion | 75 | if parentfn == fn: # prevent infinite recursion |
76 | return None | 76 | return None |
77 | 77 | ||
78 | import bb | 78 | import bb |
79 | fn = data.expand(fn) | 79 | fn = data.expand(fn) |
80 | oldfn = data.expand(oldfn) | 80 | parentfn = data.expand(parentfn) |
81 | 81 | ||
82 | if not os.path.isabs(fn): | 82 | if not os.path.isabs(fn): |
83 | dname = os.path.dirname(oldfn) | 83 | dname = os.path.dirname(parentfn) |
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): |
@@ -97,7 +97,7 @@ def include(oldfn, fn, lineno, data, error_out): | |||
97 | ret = handle(fn, data, True) | 97 | ret = handle(fn, data, True) |
98 | except (IOError, OSError): | 98 | except (IOError, OSError): |
99 | if error_out: | 99 | if error_out: |
100 | raise ParseError("Could not %(error_out)s file %(fn)s" % vars(), oldfn, lineno) | 100 | raise ParseError("Could not %(error_out)s file %(fn)s" % vars(), parentfn, lineno) |
101 | logger.debug(2, "CONF file '%s' not found", fn) | 101 | logger.debug(2, "CONF file '%s' not found", fn) |
102 | bb.parse.mark_dependency(data, fn) | 102 | bb.parse.mark_dependency(data, fn) |
103 | 103 | ||