diff options
author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-04-12 12:54:21 -0400 |
---|---|---|
committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-04-13 11:57:13 -0400 |
commit | 886a5de15f7e9861f1b3f66be2a0b3dfabab2956 (patch) | |
tree | 588d68ff9b35b31892fa76169986d44c2247b7a9 /src/lib/Bcfg2/Server/Reports | |
parent | dc4da95bdc0172effba7551946ef0958c029cc42 (diff) | |
download | bcfg2-886a5de15f7e9861f1b3f66be2a0b3dfabab2956.tar.gz bcfg2-886a5de15f7e9861f1b3f66be2a0b3dfabab2956.tar.bz2 bcfg2-886a5de15f7e9861f1b3f66be2a0b3dfabab2956.zip |
do not set django TIME_ZONE except in 1.2+
Diffstat (limited to 'src/lib/Bcfg2/Server/Reports')
-rw-r--r-- | src/lib/Bcfg2/Server/Reports/settings.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/Bcfg2/Server/Reports/settings.py b/src/lib/Bcfg2/Server/Reports/settings.py index c8ceb5d88..4d567f1a2 100644 --- a/src/lib/Bcfg2/Server/Reports/settings.py +++ b/src/lib/Bcfg2/Server/Reports/settings.py @@ -64,10 +64,10 @@ if django.VERSION[0] == 1 and django.VERSION[1] < 2: # Local time zone for this installation. All choices can be found here: # http://docs.djangoproject.com/en/dev/ref/settings/#time-zone -try: - TIME_ZONE = c.get('statistics', 'time_zone') -except: - if django.VERSION[0] == 1 and django.VERSION[1] > 2: +if django.VERSION[0] == 1 and django.VERSION[1] > 2: + try: + TIME_ZONE = c.get('statistics', 'time_zone') + except: TIME_ZONE = None # Language code for this installation. All choices can be found here: |