mirror of
git://git.yoctoproject.org/poky.git
synced 2025-07-19 21:09:03 +02:00
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>
This commit is contained in:
parent
e8b88168f5
commit
46c6a8d63c
|
@ -112,10 +112,10 @@ parser.add_argument('--jsondata', default=__file__+".json", help='File containin
|
||||||
args = parser.parse_args()
|
args = parser.parse_args()
|
||||||
|
|
||||||
with open(args.jsondata) as f:
|
with open(args.jsondata) as f:
|
||||||
json = json.load(f)
|
json_f = json.load(f)
|
||||||
|
|
||||||
supported_versions = ["1.0"]
|
supported_versions = ["1.0"]
|
||||||
if json["version"] not in 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["version"], 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)
|
||||||
|
|
Loading…
Reference in New Issue
Block a user