summaryrefslogtreecommitdiffstats
path: root/src/lib/Bcfg2/Reporting/Reports.py
diff options
context:
space:
mode:
authorSol Jerome <sol.jerome@gmail.com>2015-10-01 19:58:20 -0500
committerSol Jerome <sol.jerome@gmail.com>2015-10-01 19:58:20 -0500
commit35a2ad1d76790b62b3dbb41cb7fa112c81dc4d5f (patch)
treea451a77147bc9fabce6e224e2038eedc78e27969 /src/lib/Bcfg2/Reporting/Reports.py
parent061bd6abbb598659554f28a1a5bba45fd6eca6da (diff)
parenta505fb3b2df0d1eddfe7a92afb080b016e951a43 (diff)
downloadbcfg2-35a2ad1d76790b62b3dbb41cb7fa112c81dc4d5f.tar.gz
bcfg2-35a2ad1d76790b62b3dbb41cb7fa112c81dc4d5f.tar.bz2
bcfg2-35a2ad1d76790b62b3dbb41cb7fa112c81dc4d5f.zip
Merge branch 'fix/django1.7' of https://github.com/AlexanderS/bcfg2
Diffstat (limited to 'src/lib/Bcfg2/Reporting/Reports.py')
-rwxr-xr-xsrc/lib/Bcfg2/Reporting/Reports.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/lib/Bcfg2/Reporting/Reports.py b/src/lib/Bcfg2/Reporting/Reports.py
index ebd0db58f..ee3c27709 100755
--- a/src/lib/Bcfg2/Reporting/Reports.py
+++ b/src/lib/Bcfg2/Reporting/Reports.py
@@ -4,6 +4,7 @@
import sys
import argparse
import datetime
+import django
import Bcfg2.DBSettings
@@ -307,6 +308,8 @@ class CLI(Bcfg2.Options.CommandRegistry):
components=[self])
parser.add_options(self.subcommand_options)
parser.parse()
+ if django.VERSION[0] == 1 and django.VERSION[1] >= 7:
+ django.setup() # pylint: disable=E1101
def run(self):
""" Run bcfg2-reports """