From: Humberto Ibarra Date: Mon, 4 Jul 2016 19:54:53 +0000 (-0500) Subject: scripts/lib/bsp/engine.py: Add error message for wrong input file X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7e543aa19d0d4b2112e6316783fb31b76df3493e;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git scripts/lib/bsp/engine.py: Add error message for wrong input file Format of properties file is expected to be a simple json detailing properties, if this format fails an exception is thrown. This patch adds a graceful error message to the case when the properties file has a wrong format. [YOCTO #9750] Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- diff --git a/scripts/lib/bsp/engine.py b/scripts/lib/bsp/engine.py index 85f095ebcbf..760efc7a60d 100644 --- a/scripts/lib/bsp/engine.py +++ b/scripts/lib/bsp/engine.py @@ -1547,11 +1547,13 @@ def yocto_common_create(machine, target, scripts_path, layer_output_dir, codedum if properties_file: try: infile = open(properties_file, "r") + properties = json.load(infile) except IOError: print("Couldn't open properties file %s for reading, exiting" % properties_file) sys.exit(1) - - properties = json.load(infile) + except ValueError: + print("Wrong format on properties file %s, exiting" % properties_file) + sys.exit(1) if properties_str and not properties: properties = json.loads(properties_str)