From f8df569c2d0463e2a47728b27cc71d5f240001ee Mon Sep 17 00:00:00 2001 From: Jeffrey Townsend Date: Thu, 1 Dec 2016 17:14:04 +0000 Subject: [PATCH] Tolerate missing dmidecode module amd missing platform info object. --- .../vendor-config-onl/src/python/onl/platform/base.py | 11 +++++++++-- 1 file changed, 9 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 3abda83a..0b8ffbf2 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 @@ -118,7 +118,10 @@ class OnlPlatformBase(object): self.add_info_json("platform_info", "%s/platform-info.json" % self.basedir_onl(), PlatformInfo, required=False) - self.platform_info.update(self.dmi_versions()) + if hasattr(self, "platform_info"): + self.platform_info.update(self.dmi_versions()) + else: + self.add_info_dict("platform_info", self.dmi_versions()) # Find the base platform config if self.platform().startswith('x86-64'): @@ -235,7 +238,11 @@ class OnlPlatformBase(object): if platform.machine() != "x86_64": return {} - import dmidecode + try: + import dmidecode + except ImportError: + return {} + fields = [ { 'name': 'DMI BIOS Version',