summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Sulfrian <alexander.sulfrian@fu-berlin.de>2015-09-21 20:39:25 +0200
committerAlexander Sulfrian <alexander.sulfrian@fu-berlin.de>2015-09-23 19:29:00 +0200
commit9620905fe71ffa6a8ff01414cdcc870dcbdd631a (patch)
treee719e81f0f6fb3b5b7a0000448630e1213e1c367
parenteae3cfb904c86f519d409724585eafcab99c74bd (diff)
downloadbcfg2-9620905fe71ffa6a8ff01414cdcc870dcbdd631a.tar.gz
bcfg2-9620905fe71ffa6a8ff01414cdcc870dcbdd631a.tar.bz2
bcfg2-9620905fe71ffa6a8ff01414cdcc870dcbdd631a.zip
DBSettings: syncdb is replaced by migrate
-rw-r--r--src/lib/Bcfg2/DBSettings.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/lib/Bcfg2/DBSettings.py b/src/lib/Bcfg2/DBSettings.py
index 06988d6ef..5c3b8a265 100644
--- a/src/lib/Bcfg2/DBSettings.py
+++ b/src/lib/Bcfg2/DBSettings.py
@@ -148,11 +148,13 @@ def finalize_django_config(opts=None, silent=False):
def sync_databases(**kwargs):
""" Synchronize all databases that we know about. """
+ if django.VERSION[0] == 1 and django.VERSION[1] >= 7:
+ # Nothing needed here, it's all handled with migrate
+ return
+
logger = logging.getLogger()
for database in settings['DATABASES']:
logger.debug("Syncing database %s" % (database))
- if django.VERSION[0] == 1 and django.VERSION[1] >= 7:
- django.setup() # pylint: disable=E1101
django.core.management.call_command("syncdb", database=database,
**kwargs)