summaryrefslogtreecommitdiffstats
path: root/src/lib/Bcfg2/Server/Admin.py
diff options
context:
space:
mode:
authorJonas Jochmaring <jjonas@mail.upb.de>2015-07-09 16:14:08 +0200
committerAlexander Sulfrian <alexander.sulfrian@fu-berlin.de>2015-09-23 19:28:58 +0200
commitbda4daf4c2c5dad964c8f2e9c777fdea000d0731 (patch)
tree044fa2fe637f608b044c79886ee1c0603efd5b13 /src/lib/Bcfg2/Server/Admin.py
parent5f28e717e56c8f1c88f5d635d007ad26bba4cfe0 (diff)
downloadbcfg2-bda4daf4c2c5dad964c8f2e9c777fdea000d0731.tar.gz
bcfg2-bda4daf4c2c5dad964c8f2e9c777fdea000d0731.tar.bz2
bcfg2-bda4daf4c2c5dad964c8f2e9c777fdea000d0731.zip
added django.setup() calls to src/lib/Bcfg2/DBSettings.py
Diffstat (limited to 'src/lib/Bcfg2/Server/Admin.py')
-rw-r--r--src/lib/Bcfg2/Server/Admin.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/Bcfg2/Server/Admin.py b/src/lib/Bcfg2/Server/Admin.py
index b7ee0c0ed..1b2a2fe14 100644
--- a/src/lib/Bcfg2/Server/Admin.py
+++ b/src/lib/Bcfg2/Server/Admin.py
@@ -905,7 +905,7 @@ if HAS_DJANGO:
""" Sync the Django ORM with the configured database """
if HAS_DJANGO and django.VERSION[0] == 1 and django.VERSION[1] >= 7:
- django.setup()
+ django.setup() # pylint: disable=E1101
def run(self, setup):
Bcfg2.Server.models.load_models()
@@ -1204,7 +1204,7 @@ class CLI(Bcfg2.Options.CommandRegistry):
if 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
+ django.setup() # pylint: disable=E1101
def run(self):
""" Run bcfg2-admin """