diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-01-15 09:41:23 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-01-16 08:25:30 +0000 |
commit | 5c9e2b2f435d6f4f72962370ef3b403bb3d1d883 (patch) | |
tree | 6c638fd2832a5dfdd6d6efb39fb4eb22e06e6521 /bitbake/lib/bb/parse | |
parent | 967f13fda096e0c1cc429ce55a8e305894a8b576 (diff) | |
download | openembedded-core-contrib-5c9e2b2f435d6f4f72962370ef3b403bb3d1d883.tar.gz |
bitbake: ConfHandler: Rename oldfn to parentfn to be clearer
Looking at this function I had no idea what oldfn was, I doubt anyone
else would either without looking up what the caller does. "parentfn"
would seem a more appropriate name so rename it.
(Bitbake rev: fc70ed596703a1aa954223b169d4ad51193a6ec1)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
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): def supports(fn, d): return fn[-5:] == ".conf" -def include(oldfn, fn, lineno, data, error_out): +def include(parentfn, fn, lineno, data, error_out): """ error_out: A string indicating the verb (e.g. "include", "inherit") to be used in a ParseError that will be raised if the file to be included could not be included. Specify False to avoid raising an error in this case. """ - if oldfn == fn: # prevent infinite recursion + if parentfn == fn: # prevent infinite recursion return None import bb fn = data.expand(fn) - oldfn = data.expand(oldfn) + parentfn = data.expand(parentfn) if not os.path.isabs(fn): - dname = os.path.dirname(oldfn) + dname = os.path.dirname(parentfn) bbpath = "%s:%s" % (dname, data.getVar("BBPATH", True)) abs_fn, attempts = bb.utils.which(bbpath, fn, history=True) if abs_fn and bb.parse.check_dependency(data, abs_fn): @@ -97,7 +97,7 @@ def include(oldfn, fn, lineno, data, error_out): ret = handle(fn, data, True) except (IOError, OSError): if error_out: - raise ParseError("Could not %(error_out)s file %(fn)s" % vars(), oldfn, lineno) + raise ParseError("Could not %(error_out)s file %(fn)s" % vars(), parentfn, lineno) logger.debug(2, "CONF file '%s' not found", fn) bb.parse.mark_dependency(data, fn) |