Fix version JSON

The JSON provided wasn't valid, also changing the exception in lib/Elastic.py
to be more general so as to handle cases like this.

Change-Id: I2b94783c3af383cdd868835bfe9514baf2bd978b
This commit is contained in:
Sai Sindhur Malleni 2016-09-21 17:21:37 -04:00
parent 7d90a11856
commit df3130c814
2 changed files with 2 additions and 2 deletions

View File

@ -70,7 +70,7 @@ class Elastic:
try: try:
with open(_meta['file']) as jdata: with open(_meta['file']) as jdata:
result[_meta['name']] = json.load(jdata) result[_meta['name']] = json.load(jdata)
except (IOError, OSError): except Exception:
self.logger.error( self.logger.error(
"Error loading Metadata file : {}".format(_meta['file'])) "Error loading Metadata file : {}".format(_meta['file']))
self.logger.error("Please make sure the metadata file exists and" self.logger.error("Please make sure the metadata file exists and"

View File

@ -1,4 +1,4 @@
{ {
"osp_series": "newton", "osp_series": "newton",
"build": "2016-09-01.1", "build": "2016-09-01.1"
} }