mirror of
https://git.yoctoproject.org/poky
synced 2026-06-03 01:40:07 +00:00
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>
This commit is contained in:
committed by
Richard Purdie
parent
c9c230b14a
commit
0d25a516b4
@@ -293,7 +293,7 @@ def handleInherit(statements, m):
|
|||||||
n = __word__.findall(files)
|
n = __word__.findall(files)
|
||||||
statements.append(InheritNode(m.group(1)))
|
statements.append(InheritNode(m.group(1)))
|
||||||
|
|
||||||
def finalise(fn, d):
|
def finalize(fn, d):
|
||||||
for lazykey in bb.data.getVar("__lazy_assigned", d) or ():
|
for lazykey in bb.data.getVar("__lazy_assigned", d) or ():
|
||||||
if bb.data.getVar(lazykey, d) is None:
|
if bb.data.getVar(lazykey, d) is None:
|
||||||
val = bb.data.getVarFlag(lazykey, "defaultval", d)
|
val = bb.data.getVarFlag(lazykey, "defaultval", d)
|
||||||
@@ -358,7 +358,7 @@ def multi_finalize(fn, d):
|
|||||||
|
|
||||||
d = bb.data.createCopy(safe_d)
|
d = bb.data.createCopy(safe_d)
|
||||||
try:
|
try:
|
||||||
finalise(fn, d)
|
finalize(fn, d)
|
||||||
except bb.parse.SkipPackage:
|
except bb.parse.SkipPackage:
|
||||||
bb.data.setVar("__SKIPPED", True, d)
|
bb.data.setVar("__SKIPPED", True, d)
|
||||||
datastores = {"": safe_d}
|
datastores = {"": safe_d}
|
||||||
@@ -401,7 +401,7 @@ def multi_finalize(fn, d):
|
|||||||
d = bb.data.createCopy(safe_d)
|
d = bb.data.createCopy(safe_d)
|
||||||
verfunc(pv, d, safe_d)
|
verfunc(pv, d, safe_d)
|
||||||
try:
|
try:
|
||||||
finalise(fn, d)
|
finalize(fn, d)
|
||||||
except bb.parse.SkipPackage:
|
except bb.parse.SkipPackage:
|
||||||
bb.data.setVar("__SKIPPED", True, d)
|
bb.data.setVar("__SKIPPED", True, d)
|
||||||
|
|
||||||
@@ -420,7 +420,7 @@ def multi_finalize(fn, d):
|
|||||||
for variant, variant_d in datastores.items():
|
for variant, variant_d in datastores.items():
|
||||||
if variant:
|
if variant:
|
||||||
try:
|
try:
|
||||||
finalise(fn, variant_d)
|
finalize(fn, variant_d)
|
||||||
except bb.parse.SkipPackage:
|
except bb.parse.SkipPackage:
|
||||||
bb.data.setVar("__SKIPPED", True, variant_d)
|
bb.data.setVar("__SKIPPED", True, variant_d)
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user