summaryrefslogtreecommitdiffstats
path: root/src/lib/Bcfg2/settings.py
diff options
context:
space:
mode:
authorTim Laszlo <tim.laszlo@gmail.com>2013-03-18 18:22:46 -0500
committerTim Laszlo <tim.laszlo@gmail.com>2013-03-18 18:22:46 -0500
commite0d8251f2b8cb315b8124d2733aaab90b9f7e2a2 (patch)
tree69879cbe237869ecf65d76457f974cfcc596ff08 /src/lib/Bcfg2/settings.py
parent2500f64e66a2d664b35263bf228d8302944acb62 (diff)
downloadbcfg2-e0d8251f2b8cb315b8124d2733aaab90b9f7e2a2.tar.gz
bcfg2-e0d8251f2b8cb315b8124d2733aaab90b9f7e2a2.tar.bz2
bcfg2-e0d8251f2b8cb315b8124d2733aaab90b9f7e2a2.zip
Fix django TIME_ZONE for django < 1.2
Diffstat (limited to 'src/lib/Bcfg2/settings.py')
-rw-r--r--src/lib/Bcfg2/settings.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/lib/Bcfg2/settings.py b/src/lib/Bcfg2/settings.py
index 9e6a815c7..5300d068f 100644
--- a/src/lib/Bcfg2/settings.py
+++ b/src/lib/Bcfg2/settings.py
@@ -27,7 +27,10 @@ DATABASE_PASSWORD = None
DATABASE_HOST = None
DATABASE_PORT = None
-TIME_ZONE = None
+if HAS_DJANGO and django.VERSION[0] == 1 and django.VERSION[1] < 2:
+ TIME_ZONE = 'America/Chicago'
+else:
+ TIME_ZONE = None
DEBUG = False
TEMPLATE_DEBUG = DEBUG