sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

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]

(From meta-yocto rev: 7e543aa19d0d4b2112e6316783fb31b76df3493e)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Humberto Ibarra 2016-07-04 14:54:53 -05:00 committed by Richard Purdie
parent 71bc7fd8ce
commit 4252ec78a4
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/lib/bsp/engine.py
View File

@ -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)