From 45b9500caff3e4de66be563cd626ef11ee0af7c5 Mon Sep 17 00:00:00 2001 From: Dmitri Iouchtchenko Date: Sun, 11 Sep 2016 00:40:29 -0400 Subject: bcfg2-admin: Check for django before checking django version --- src/lib/Bcfg2/Server/Admin.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/lib/Bcfg2/Server') 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 -- cgit v1.2.3-1-g7c22