From 96bdd192700aa1f638f47e96170c9ccd2821c615 Mon Sep 17 00:00:00 2001 From: Alexander Sulfrian Date: Mon, 21 Sep 2015 19:46:26 +0200 Subject: Server/Admin: Remove call of django.setup django.setup() is already called from the option parsing before. --- src/lib/Bcfg2/Server/Admin.py | 3 --- 1 file changed, 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: -- cgit v1.2.3-1-g7c22