summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Sulfrian <alexander.sulfrian@fu-berlin.de>2015-09-21 19:46:26 +0200
committerAlexander Sulfrian <alexander.sulfrian@fu-berlin.de>2015-09-23 19:29:01 +0200
commit96bdd192700aa1f638f47e96170c9ccd2821c615 (patch)
tree4b3f8785cfbe67911784b31169d7875c835b595e
parent9620905fe71ffa6a8ff01414cdcc870dcbdd631a (diff)
downloadbcfg2-96bdd192700aa1f638f47e96170c9ccd2821c615.tar.gz
bcfg2-96bdd192700aa1f638f47e96170c9ccd2821c615.tar.bz2
bcfg2-96bdd192700aa1f638f47e96170c9ccd2821c615.zip
Server/Admin: Remove call of django.setup
django.setup() is already called from the option parsing before.
-rw-r--r--src/lib/Bcfg2/Server/Admin.py3
1 files changed, 0 insertions, 3 deletions
diff --git a/src/lib/Bcfg2/Server/Admin.py b/src/lib/Bcfg2/Server/Admin.py
index 1b2a2fe14..c6924ef6c 100644
--- a/src/lib/Bcfg2/Server/Admin.py
+++ b/src/lib/Bcfg2/Server/Admin.py
@@ -904,9 +904,6 @@ if HAS_DJANGO:
class Syncdb(AdminCmd):
""" Sync the Django ORM with the configured database """
- if HAS_DJANGO and django.VERSION[0] == 1 and django.VERSION[1] >= 7:
- django.setup() # pylint: disable=E1101
-
def run(self, setup):
Bcfg2.Server.models.load_models()
try: