Fix SConstruct check for config.is_enabled()

1 files changed, 6 insertions, 7 deletions

diff --git a/SConstruct b/SConstruct
index 8b23b60774..6045be54c7 100644
--- a/SConstruct
+++ b/SConstruct
@@ -192,13 +192,12 @@ for x in module_list:
     module_enabled = True
     tmppath = "./modules/" + x
     sys.path.append(tmppath)
-    try:
-        import config
-        if (not config.is_enabled()):
-            module_enabled = False
-    except:
-        pass
+    import config
+    enabled_attr = getattr(config, "is_enabled", None)
+    if (callable(enabled_attr) and not config.is_enabled()):
+        module_enabled = False
     sys.path.remove(tmppath)
+    sys.modules.pop('config')
     opts.Add(BoolVariable('module_' + x + '_enabled', "Enable module '%s'" % (x, ), module_enabled))
 
 opts.Update(env_base)  # update environment
@@ -246,7 +245,7 @@ if selected_platform in platform_list:
         env = detect.create(env_base)
     else:
         env = env_base.Clone()
-    
+
     if env['dev']:
         env["warnings"] = "all"
         env['verbose'] = True