summaryrefslogtreecommitdiff
path: root/django/archives/settings.py
diff options
context:
space:
mode:
authorMagnus Hagander2012-08-12 14:57:37 +0000
committerMagnus Hagander2012-08-12 14:58:00 +0000
commit20fe0ee6ed83150e95826d9969e0bce3200ad1a6 (patch)
tree1fbbbe35f3f30ce7c36f88e3e8ecc872980990ac /django/archives/settings.py
parent0be939fbee57410894c72f86c262b01284139b11 (diff)
Don't crash when settings_local.py is missing
Diffstat (limited to 'django/archives/settings.py')
-rw-r--r--django/archives/settings.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/django/archives/settings.py b/django/archives/settings.py
index b2c871b..edf529b 100644
--- a/django/archives/settings.py
+++ b/django/archives/settings.py
@@ -150,4 +150,7 @@ LOGGING = {
# Required for lighttpd
FORCE_SCRIPT_NAME=""
-from settings_local import *
+try:
+ from settings_local import *
+except:
+ pass