diff options
| author | Sol Jerome <sol.jerome@gmail.com> | 2016-09-12 09:22:52 -0500 |
|---|---|---|
| committer | Sol Jerome <sol.jerome@gmail.com> | 2016-09-12 09:22:52 -0500 |
| commit | bf2dfbbebcf17840319955697d3a5edf4eb85960 (patch) | |
| tree | 72bb5d5d7c35c6751351c9236077f49a03fbe70b /src | |
| parent | 4d82f54bbfe430468733afddf4fa9ad4752310da (diff) | |
| parent | 45b9500caff3e4de66be563cd626ef11ee0af7c5 (diff) | |
| download | bcfg2-bf2dfbbebcf17840319955697d3a5edf4eb85960.tar.gz bcfg2-bf2dfbbebcf17840319955697d3a5edf4eb85960.tar.bz2 bcfg2-bf2dfbbebcf17840319955697d3a5edf4eb85960.zip | |
Merge branch 'django-check' of https://github.com/0/bcfg2
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/Bcfg2/Server/Admin.py | 2 |
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 |