Permalink
Browse files

Fix settings import to be same as DMS

  • Loading branch information...
1 parent ccb1dfe commit cb15d0cf963ec8178980b80a1feda9c824dfc7b7 @macropin macropin committed Apr 30, 2012
Showing with 8 additions and 2 deletions.
  1. +8 −2 settings.py → settings_prod.py
@@ -1,4 +1,4 @@
-from adlibre_tms.settings import *
+from adlibre_tms.settings import * # Import global settings
# HACK: Here be magic and import voodoo...
# This file exists just to make manage.py happy when passing --settings= parameter.
@@ -19,4 +19,10 @@
MEDIA_ROOT = os.path.abspath(os.path.join(PROJECT_PATH, '..', 'www', 'media'))
STATIC_ROOT = os.path.abspath(os.path.join(PROJECT_PATH, '..', 'www', 'static'))
-###
+###
+
+# This will import the local_settings in our virtual_env subdir next to manage.py.
+try:
+ from local_settings import *
+except ImportError:
+ pass

0 comments on commit cb15d0c

Please sign in to comment.