diff options
| author | Tim Laszlo <tim.laszlo@gmail.com> | 2013-03-18 18:22:46 -0500 |
|---|---|---|
| committer | Tim Laszlo <tim.laszlo@gmail.com> | 2013-03-18 18:25:37 -0500 |
| commit | 4f6ba35fd86ae748d77557936e39db162cc282e3 (patch) | |
| tree | f83eaeea83f7710fac6cbed11b786331647644b0 /src | |
| parent | d56c2292b52359bec50f5e7e7d8b1870c6edfa21 (diff) | |
| download | bcfg2-4f6ba35fd86ae748d77557936e39db162cc282e3.tar.gz bcfg2-4f6ba35fd86ae748d77557936e39db162cc282e3.tar.bz2 bcfg2-4f6ba35fd86ae748d77557936e39db162cc282e3.zip | |
Fix django TIME_ZONE for django < 1.2
(cherry picked from commit e0d8251f2b8cb315b8124d2733aaab90b9f7e2a2)
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/Bcfg2/settings.py | 5 |
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 |