From 201832017430b427d11090a8037df48baa9a04f7 Mon Sep 17 00:00:00 2001 From: Jeffrey Townsend Date: Tue, 13 Dec 2016 21:32:08 +0000 Subject: [PATCH] Except only if required. --- .../all/vendor-config-onl/src/python/onl/platform/base.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/packages/base/all/vendor-config-onl/src/python/onl/platform/base.py b/packages/base/all/vendor-config-onl/src/python/onl/platform/base.py index 5d43ce15..68e7d0d9 100644 --- a/packages/base/all/vendor-config-onl/src/python/onl/platform/base.py +++ b/packages/base/all/vendor-config-onl/src/python/onl/platform/base.py @@ -158,8 +158,12 @@ class OnlPlatformBase(object): def add_info_json(self, name, f, klass=None, required=True): if os.path.exists(f): - d = json.load(file(f)) - self.add_info_dict(name, d, klass) + try: + d = json.load(file(f)) + self.add_info_dict(name, d, klass) + except ValueError, e: + if required: + raise e elif required: raise RuntimeError("A required system file (%s) is missing." % f)