Don't crash when settings_local.py is missing
authorMagnus Hagander <magnus@hagander.net>
Sun, 12 Aug 2012 14:57:37 +0000 (16:57 +0200)
committerMagnus Hagander <magnus@hagander.net>
Sun, 12 Aug 2012 14:58:00 +0000 (16:58 +0200)
django/archives/.gitignore [new file with mode: 0644]
django/archives/settings.py

diff --git a/django/archives/.gitignore b/django/archives/.gitignore
new file mode 100644 (file)
index 0000000..fd2351e
--- /dev/null
@@ -0,0 +1 @@
+settings_local.py
index b2c871b2b3846158a3336a6cb0d25ebd55c6da5e..edf529b400f58debef8736991b7c85dd7d65fce1 100644 (file)
@@ -150,4 +150,7 @@ LOGGING = {
 # Required for lighttpd
 FORCE_SCRIPT_NAME=""
 
-from settings_local import *
+try:
+       from settings_local import *
+except:
+       pass