From: Alexander Kanavin Date: Sun, 19 Feb 2023 19:30:24 +0000 (+0100) Subject: scripts/oe-setup-layers: do not clobber json module with a variable named 'json' X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~1658 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=91e5aef9fd710b08ead9491f1900fbab5386b157;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git scripts/oe-setup-layers: do not clobber json module with a variable named 'json' Signed-off-by: Alexander Kanavin Signed-off-by: Alexandre Belloni --- 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)