From 91e5aef9fd710b08ead9491f1900fbab5386b157 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Sun, 19 Feb 2023 20:30:24 +0100 Subject: [PATCH] scripts/oe-setup-layers: do not clobber json module with a variable named 'json' Signed-off-by: Alexander Kanavin Signed-off-by: Alexandre Belloni --- scripts/oe-setup-layers | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/oe-setup-layers b/scripts/oe-setup-layers index 6c02262663c..c8012fa6705 100755 --- a/scripts/oe-setup-layers +++ b/scripts/oe-setup-layers @@ -112,10 +112,10 @@ parser.add_argument('--jsondata', default=__file__+".json", help='File containin args = parser.parse_args() with open(args.jsondata) as f: - json = json.load(f) + json_f = json.load(f) supported_versions = ["1.0"] -if json["version"] not in supported_versions: - raise Exception("File {} has version {}, which is not in supported versions: {}".format(args.jsondata, json["version"], supported_versions)) +if json_f["version"] not in supported_versions: + raise Exception("File {} has version {}, which is not in supported versions: {}".format(args.jsondata, json_f["version"], supported_versions)) -_do_checkout(vars(args), json) +_do_checkout(vars(args), json_f) -- 2.47.3