summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2023-02-19 20:30:24 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2023-02-20 15:18:30 +0000
commit46c6a8d63cd4efb01792c9605b1f95397ad8257c (patch)
treea14b958478a53b5ccebd820ba6fa7d0ef4a9d583 /scripts
parente8b88168f5228c8314f5bdf139edfdeebc0044b5 (diff)
downloadpoky-46c6a8d63cd4efb01792c9605b1f95397ad8257c.tar.gz
scripts/oe-setup-layers: do not clobber json module with a variable named 'json'
(From OE-Core rev: 91e5aef9fd710b08ead9491f1900fbab5386b157) Signed-off-by: Alexander Kanavin <alex@linutronix.de> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/oe-setup-layers8
1 files changed, 4 insertions, 4 deletions
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
112args = parser.parse_args() 112args = parser.parse_args()
113 113
114with open(args.jsondata) as f: 114with open(args.jsondata) as f:
115 json = json.load(f) 115 json_f = json.load(f)
116 116
117supported_versions = ["1.0"] 117supported_versions = ["1.0"]
118if json["version"] not in supported_versions: 118if json_f["version"] not in supported_versions:
119 raise Exception("File {} has version {}, which is not in supported versions: {}".format(args.jsondata, json["version"], supported_versions)) 119 raise Exception("File {} has version {}, which is not in supported versions: {}".format(args.jsondata, json_f["version"], supported_versions))
120 120
121_do_checkout(vars(args), json) 121_do_checkout(vars(args), json_f)