From 981ecb069a283cb7ac67a379d0bb8dd578672694 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Mon, 14 Mar 2022 10:13:54 +0800 Subject: 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: 18c8bf506355a432a767f09879ea32119c593513) Signed-off-by: Richard Purdie (cherry picked from commit 551c1cb20fc9b9d0dab5d830182c2bf626e72845) Signed-off-by: Anuj Mittal Signed-off-by: Richard Purdie --- bitbake/lib/bb/data_smart.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/bitbake/lib/bb/data_smart.py b/bitbake/lib/bb/data_smart.py index 5ffedebc27..e960327871 100644 --- a/bitbake/lib/bb/data_smart.py +++ b/bitbake/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 = {} -- cgit v1.2.3-54-g00ecf