[1.52,1/1] data_smart.py: Skip old override syntax checking for anonymous functions

Message ID 04929e5f6cc9090e74e910d03889aed40d971d4b.1639015193.git.anuj.mittal@intel.com
State Accepted, archived
Commit 5c46ce77aa55cb46abe224b6a31dad87b9249bcf
Headers show
Series [1.52,1/1] data_smart.py: Skip old override syntax checking for anonymous functions | expand

Commit Message

Mittal, Anuj Dec. 9, 2021, 2:02 a.m. UTC
From: Robert Yang <liezhi.yang@windriver.com>

Fixed when oe-core's path contians append/prepend/remove, e.g.:

/path/to/append_test/oe-core/

Initial a build in any build dirs:
$ bitbake -p
ERROR: Variable __anon_32__buildarea2_xhou_builds_append_test_layers_oe_core_meta_classes_patch_bbclass
contains an operation using the old override syntax. Please convert this
layer/metadata before attempting to use with a newer bitbake.

The anonymous fuctions has no names, so skip checking for it to fix the issue.

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit ebd00330c41c75797529ff38d6a0955b93f05d1b)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
 lib/bb/data_smart.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Patch

diff --git a/lib/bb/data_smart.py b/lib/bb/data_smart.py
index 8d235da1..5ffedebc 100644
--- a/lib/bb/data_smart.py
+++ b/lib/bb/data_smart.py
@@ -492,7 +492,7 @@  class DataSmart(MutableMapping):
     def setVar(self, var, value, **loginfo):
         #print("var=" + str(var) + "  val=" + str(value))
 
-        if "_append" in var or "_prepend" in var or "_remove" in var:
+        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]