harvest-dev team mailing list archive

[Daniel Holbach <daniel.holbach@xxxxxxxxxx>]

Daniel Holbach has proposed merging lp:~dholbach/harvest/fix-settings into lp:harvest.

Requested reviews:
  harvest-dev (harvest-dev)

-- 
https://code.launchpad.net/~dholbach/harvest/fix-settings/+merge/44467
Your team harvest-dev is requested to review the proposed merge of lp:~dholbach/harvest/fix-settings into lp:harvest.

=== modified file 'harvest/settings.py'
--- harvest/settings.py	2010-12-08 08:15:50 +0000
+++ harvest/settings.py	2010-12-22 14:36:22 +0000
@@ -7,11 +7,6 @@
 except ImportError:
     toolbar_available = False
 
-try:
-    from local_settings import *
-except ImportError:
-    logging.warning("No local_settings.py were found. See INSTALL for instructions.")
-
 from common import utils
 
 PROJECT_PATH = os.path.dirname(os.path.abspath(__file__))
@@ -151,6 +146,11 @@
 LOGIN_URL = '/openid/login'
 LOGIN_REDIRECT_URL = '/'
 
+try:
+    from local_settings import *
+except ImportError:
+    logging.warning("No local_settings.py were found. See INSTALL for instructions.")
+
 
 #local_settings.py can change the value of DEBUG, so we should only access it now
 TEMPLATE_DEBUG = DEBUG