Fail with a useful error if no shareabouts flavor is configured.

openplans · Feb 27, 2015 · a88bc18 · a88bc18
1 parent e49155c
commit a88bc18
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/project/settings.py b/src/project/settings.py
@@ -340,13 +340,13 @@
 
 try:
     SHAREABOUTS
-except NameError:
+    flavor = SHAREABOUTS['FLAVOR']
+except (NameError, TypeError, KeyError):
     from django.core.exceptions import ImproperlyConfigured
     raise ImproperlyConfigured('No SHAREABOUTS configuration defined. '
         'Did you forget to copy the local settings template?')
 
 here = os.path.abspath(os.path.dirname(__file__))
-flavor = SHAREABOUTS.get('FLAVOR')
 if 'CONFIG' not in SHAREABOUTS:
     SHAREABOUTS['CONFIG'] = os.path.abspath(os.path.join(here, '..', 'flavors', flavor))
 if 'PACKAGE' not in SHAREABOUTS: