diff options
| author | Alexander Sulfrian <alexander@sulfrian.net> | 2017-01-10 18:46:38 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-10 18:46:38 +0100 |
| commit | 44a5c2977e4e4c522b8bf0d26c500d8c4f3db4a8 (patch) | |
| tree | f4e3e07d26f5823e32f3197db5e949181542c218 /src/lib/Bcfg2/Server/Admin.py | |
| parent | 9797b170668a2af2b6f53312d867026850be54c3 (diff) | |
| parent | fa0d86aba32c40d829f9f94411403221a48283e8 (diff) | |
| download | bcfg2-44a5c2977e4e4c522b8bf0d26c500d8c4f3db4a8.tar.gz bcfg2-44a5c2977e4e4c522b8bf0d26c500d8c4f3db4a8.tar.bz2 bcfg2-44a5c2977e4e4c522b8bf0d26c500d8c4f3db4a8.zip | |
Merge pull request #373 from AlexanderS/fix/django1.9/report-collector
Fix bcfg2-report-collector for django-1.9
Diffstat (limited to 'src/lib/Bcfg2/Server/Admin.py')
| -rw-r--r-- | src/lib/Bcfg2/Server/Admin.py | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/lib/Bcfg2/Server/Admin.py b/src/lib/Bcfg2/Server/Admin.py index b35f73ba4..77bca88eb 100644 --- a/src/lib/Bcfg2/Server/Admin.py +++ b/src/lib/Bcfg2/Server/Admin.py @@ -1228,10 +1228,6 @@ class CLI(Bcfg2.Options.CommandRegistry): components=[self]) parser.add_options(self.subcommand_options) parser.parse() - 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 def run(self): """ Run bcfg2-admin """ |