diff mbox series

[1.52,2/5] data_smart: Fix overrides file/line message additions

Message ID 2d7c63fd2626e55a17076befae33cfdca3ceedcc.1647223687.git.anuj.mittal@intel.com
State Accepted, archived
Commit 18c8bf506355a432a767f09879ea32119c593513
Headers show
Series [1.52,1/5] contrib: Fix hash server Dockerfile dependencies | expand

Commit Message

Mittal, Anuj March 14, 2022, 2:13 a.m. UTC 
From: Richard Purdie <richard.purdie@linuxfoundation.org>

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>
---
 lib/bb/data_smart.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
diff mbox series

Patch

diff --git a/lib/bb/data_smart.py b/lib/bb/data_smart.py
index 5ffedebc..e9603278 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 = {}