summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2022-02-15 11:18:39 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2022-02-17 17:51:03 +0000
commit0d3327b592d8c15155bc0b887f4eba6a0f29d8b8 (patch)
tree971d6ba9a7207da2db86a1659487a7947bae317c
parent22027da10a85194c61f1e686d1a819cc3bcfcf33 (diff)
downloadpoky-0d3327b592d8c15155bc0b887f4eba6a0f29d8b8.tar.gz
bitbake: data_smart: Fix overrides file/line message additions
The overrides warning message is meant to show filename and line numbers but the variable names are incorrect and this wasn't working. Fix it. (Bitbake rev: 551c1cb20fc9b9d0dab5d830182c2bf626e72845) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--bitbake/lib/bb/data_smart.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/bitbake/lib/bb/data_smart.py b/bitbake/lib/bb/data_smart.py
index 543372d153..242476be0e 100644
--- a/bitbake/lib/bb/data_smart.py
+++ b/bitbake/lib/bb/data_smart.py
@@ -494,10 +494,10 @@ class DataSmart(MutableMapping):
494 494
495 if not var.startswith("__anon_") and ("_append" in var or "_prepend" in var or "_remove" in var): 495 if not var.startswith("__anon_") and ("_append" in var or "_prepend" in var or "_remove" in var):
496 info = "%s" % var 496 info = "%s" % var
497 if "filename" in loginfo: 497 if "file" in loginfo:
498 info += " file: %s" % loginfo[filename] 498 info += " file: %s" % loginfo["file"]
499 if "lineno" in loginfo: 499 if "line" in loginfo:
500 info += " line: %s" % loginfo[lineno] 500 info += " line: %s" % loginfo["line"]
501 bb.fatal("Variable %s contains an operation using the old override syntax. Please convert this layer/metadata before attempting to use with a newer bitbake." % info) 501 bb.fatal("Variable %s contains an operation using the old override syntax. Please convert this layer/metadata before attempting to use with a newer bitbake." % info)
502 502
503 self.expand_cache = {} 503 self.expand_cache = {}