diff options
| author | Alexander Sulfrian <alexander.sulfrian@fu-berlin.de> | 2016-11-28 21:12:22 +0100 |
|---|---|---|
| committer | Alexander Sulfrian <alexander.sulfrian@fu-berlin.de> | 2016-11-28 21:17:54 +0100 |
| commit | fa0d86aba32c40d829f9f94411403221a48283e8 (patch) | |
| tree | 907460195745cc57287ffa2c23621a99c8a68eed /src/lib/Bcfg2/Server/Admin.py | |
| parent | 73fb40f2ac080ccbb4d9f0f0acc2c7f5009321f6 (diff) | |
| download | bcfg2-fa0d86aba32c40d829f9f94411403221a48283e8.tar.gz bcfg2-fa0d86aba32c40d829f9f94411403221a48283e8.tar.bz2 bcfg2-fa0d86aba32c40d829f9f94411403221a48283e8.zip | |
DBSettings: Call django.setup() right after configuring the settings
If required the DBSettings config hook will call django.setup right after
configuring django with the required settings. So we can drop the calls to
django.setup from all other places.
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 """ |