summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Sulfrian <alexander.sulfrian@fu-berlin.de>2015-09-21 20:45:52 +0200
committerAlexander Sulfrian <alexander.sulfrian@fu-berlin.de>2015-09-23 19:29:01 +0200
commitb5a966bdf8bed555e7c79b2cb77c14463aade22d (patch)
tree25a6e89b8701bbf7b28d7e062050b7a4156194cd
parent96bdd192700aa1f638f47e96170c9ccd2821c615 (diff)
downloadbcfg2-b5a966bdf8bed555e7c79b2cb77c14463aade22d.tar.gz
bcfg2-b5a966bdf8bed555e7c79b2cb77c14463aade22d.tar.bz2
bcfg2-b5a966bdf8bed555e7c79b2cb77c14463aade22d.zip
Server/Admin: Remove load_models() call
The models should be loaded during the options parsing and so this call issues a warning message from django, that the models are already registered.
-rw-r--r--src/lib/Bcfg2/Server/Admin.py1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/lib/Bcfg2/Server/Admin.py b/src/lib/Bcfg2/Server/Admin.py
index c6924ef6c..6bb973173 100644
--- a/src/lib/Bcfg2/Server/Admin.py
+++ b/src/lib/Bcfg2/Server/Admin.py
@@ -905,7 +905,6 @@ if HAS_DJANGO:
""" Sync the Django ORM with the configured database """
def run(self, setup):
- Bcfg2.Server.models.load_models()
try:
Bcfg2.DBSettings.sync_databases(
interactive=False,