summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDmitri Iouchtchenko <johnnyspoon@gmail.com>2016-09-11 00:40:29 -0400
committerDmitri Iouchtchenko <johnnyspoon@gmail.com>2016-09-11 12:25:47 -0400
commit45b9500caff3e4de66be563cd626ef11ee0af7c5 (patch)
tree0d297d2f0230bc9215dc44ff27106b3af3e0509b /src
parent7586aee42bc37432ad07638e254997540aa34007 (diff)
downloadbcfg2-45b9500caff3e4de66be563cd626ef11ee0af7c5.tar.gz
bcfg2-45b9500caff3e4de66be563cd626ef11ee0af7c5.tar.bz2
bcfg2-45b9500caff3e4de66be563cd626ef11ee0af7c5.zip
bcfg2-admin: Check for django before checking django version
Diffstat (limited to 'src')
-rw-r--r--src/lib/Bcfg2/Server/Admin.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/Bcfg2/Server/Admin.py b/src/lib/Bcfg2/Server/Admin.py
index c32b1989b..a387d53c6 100644
--- a/src/lib/Bcfg2/Server/Admin.py
+++ b/src/lib/Bcfg2/Server/Admin.py
@@ -1228,7 +1228,7 @@ 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:
+ if HAS_DJANGO and django.VERSION[0] == 1 and django.VERSION[1] >= 7:
# this has been introduced in django 1.7, so pylint fails with
# older django releases
django.setup() # pylint: disable=E1101