From 2edd4c9f2829a02c5c484f0dfe2e73070b2852a4 Mon Sep 17 00:00:00 2001 From: Chris Johns Date: Wed, 1 May 2013 05:30:22 +1000 Subject: [PATCH] Produce a better error message if the host support code does not load. --- source-builder/sb/options.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/source-builder/sb/options.py b/source-builder/sb/options.py index deff2ce..42bfadc 100644 --- a/source-builder/sb/options.py +++ b/source-builder/sb/options.py @@ -479,8 +479,11 @@ def load(args, optargs = None, defaults = '%{_sbdir}/defaults.mc'): overrides = None if os.name == 'nt': - import windows - overrides = windows.load() + try: + import windows + overrides = windows.load() + except: + raise error.general('failed to load Windows host support') elif os.name == 'posix': uname = os.uname() try: @@ -497,7 +500,7 @@ def load(args, optargs = None, defaults = '%{_sbdir}/defaults.mc'): import linux overrides = linux.load() except: - pass + raise error.general('failed to load %s host support' % (uname)) else: raise error.general('unsupported host type; please add') if overrides is None: