aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2022-03-14 10:13:54 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2022-03-14 13:33:12 +0000
commit18c8bf506355a432a767f09879ea32119c593513 (patch)
treeae0f1cadda21864b3c847ae94036167c0d0d5f58
parenteabf297194b36940d3fe4356db61ec0062aa039d (diff)
downloadbitbake-18c8bf506355a432a767f09879ea32119c593513.tar.gz
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. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit 551c1cb20fc9b9d0dab5d830182c2bf626e72845) Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--lib/bb/data_smart.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/bb/data_smart.py b/lib/bb/data_smart.py
index 5ffedebc2..e96032787 100644
--- a/lib/bb/data_smart.py
+++ b/lib/bb/data_smart.py
@@ -494,10 +494,10 @@ class DataSmart(MutableMapping):
if not var.startswith("__anon_") and ("_append" in var or "_prepend" in var or "_remove" in var):
info = "%s" % var
- if "filename" in loginfo:
- info += " file: %s" % loginfo[filename]
- if "lineno" in loginfo:
- info += " line: %s" % loginfo[lineno]
+ if "file" in loginfo:
+ info += " file: %s" % loginfo["file"]
+ if "line" in loginfo:
+ info += " line: %s" % loginfo["line"]
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)
self.expand_cache = {}