From 46c6a8d63cd4efb01792c9605b1f95397ad8257c Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Sun, 19 Feb 2023 20:30:24 +0100 Subject: scripts/oe-setup-layers: do not clobber json module with a variable named 'json' (From OE-Core rev: 91e5aef9fd710b08ead9491f1900fbab5386b157) Signed-off-by: Alexander Kanavin Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie --- scripts/oe-setup-layers | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'scripts') diff --git a/scripts/oe-setup-layers b/scripts/oe-setup-layers index 6c02262663..c8012fa670 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) -- cgit v1.2.3-54-g00ecf