diff options
author | Chris Larson <chris_larson@mentor.com> | 2010-04-08 16:01:14 -0700 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-07-02 15:41:31 +0100 |
commit | 0d25a516b4f6f2feb4ca99d46d1958ccd9734c9b (patch) | |
tree | 0fd097c169afd6f495af660503ba9ddb964f0efc | |
parent | c9c230b14a8202c31648c044e75e47022004014f (diff) | |
download | poky-0d25a516b4f6f2feb4ca99d46d1958ccd9734c9b.tar.gz |
Rename the finalise method for consistency
Apparently the finalise spelling is becoming less common in British English.
(Bitbake rev: 47449b2fc433e5725839ca4f7e9bca931a475838)
Signed-off-by: Chris Larson <chris_larson@mentor.com>
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
-rw-r--r-- | bitbake/lib/bb/parse/ast.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/bitbake/lib/bb/parse/ast.py b/bitbake/lib/bb/parse/ast.py index d767882e53..affe4bed4d 100644 --- a/bitbake/lib/bb/parse/ast.py +++ b/bitbake/lib/bb/parse/ast.py | |||
@@ -293,7 +293,7 @@ def handleInherit(statements, m): | |||
293 | n = __word__.findall(files) | 293 | n = __word__.findall(files) |
294 | statements.append(InheritNode(m.group(1))) | 294 | statements.append(InheritNode(m.group(1))) |
295 | 295 | ||
296 | def finalise(fn, d): | 296 | def finalize(fn, d): |
297 | for lazykey in bb.data.getVar("__lazy_assigned", d) or (): | 297 | for lazykey in bb.data.getVar("__lazy_assigned", d) or (): |
298 | if bb.data.getVar(lazykey, d) is None: | 298 | if bb.data.getVar(lazykey, d) is None: |
299 | val = bb.data.getVarFlag(lazykey, "defaultval", d) | 299 | val = bb.data.getVarFlag(lazykey, "defaultval", d) |
@@ -358,7 +358,7 @@ def multi_finalize(fn, d): | |||
358 | 358 | ||
359 | d = bb.data.createCopy(safe_d) | 359 | d = bb.data.createCopy(safe_d) |
360 | try: | 360 | try: |
361 | finalise(fn, d) | 361 | finalize(fn, d) |
362 | except bb.parse.SkipPackage: | 362 | except bb.parse.SkipPackage: |
363 | bb.data.setVar("__SKIPPED", True, d) | 363 | bb.data.setVar("__SKIPPED", True, d) |
364 | datastores = {"": safe_d} | 364 | datastores = {"": safe_d} |
@@ -401,7 +401,7 @@ def multi_finalize(fn, d): | |||
401 | d = bb.data.createCopy(safe_d) | 401 | d = bb.data.createCopy(safe_d) |
402 | verfunc(pv, d, safe_d) | 402 | verfunc(pv, d, safe_d) |
403 | try: | 403 | try: |
404 | finalise(fn, d) | 404 | finalize(fn, d) |
405 | except bb.parse.SkipPackage: | 405 | except bb.parse.SkipPackage: |
406 | bb.data.setVar("__SKIPPED", True, d) | 406 | bb.data.setVar("__SKIPPED", True, d) |
407 | 407 | ||
@@ -420,7 +420,7 @@ def multi_finalize(fn, d): | |||
420 | for variant, variant_d in datastores.items(): | 420 | for variant, variant_d in datastores.items(): |
421 | if variant: | 421 | if variant: |
422 | try: | 422 | try: |
423 | finalise(fn, variant_d) | 423 | finalize(fn, variant_d) |
424 | except bb.parse.SkipPackage: | 424 | except bb.parse.SkipPackage: |
425 | bb.data.setVar("__SKIPPED", True, variant_d) | 425 | bb.data.setVar("__SKIPPED", True, variant_d) |
426 | 426 | ||