diff options
| author | Alexander Sulfrian <alexander@sulfrian.net> | 2017-01-10 18:46:38 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-10 18:46:38 +0100 |
| commit | 44a5c2977e4e4c522b8bf0d26c500d8c4f3db4a8 (patch) | |
| tree | f4e3e07d26f5823e32f3197db5e949181542c218 /src/lib/Bcfg2/DBSettings.py | |
| parent | 9797b170668a2af2b6f53312d867026850be54c3 (diff) | |
| parent | fa0d86aba32c40d829f9f94411403221a48283e8 (diff) | |
| download | bcfg2-44a5c2977e4e4c522b8bf0d26c500d8c4f3db4a8.tar.gz bcfg2-44a5c2977e4e4c522b8bf0d26c500d8c4f3db4a8.tar.bz2 bcfg2-44a5c2977e4e4c522b8bf0d26c500d8c4f3db4a8.zip | |
Merge pull request #373 from AlexanderS/fix/django1.9/report-collector
Fix bcfg2-report-collector for django-1.9
Diffstat (limited to 'src/lib/Bcfg2/DBSettings.py')
| -rw-r--r-- | src/lib/Bcfg2/DBSettings.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/lib/Bcfg2/DBSettings.py b/src/lib/Bcfg2/DBSettings.py index 6409f8b37..254dfa4b8 100644 --- a/src/lib/Bcfg2/DBSettings.py +++ b/src/lib/Bcfg2/DBSettings.py @@ -143,6 +143,8 @@ def finalize_django_config(opts=None, silent=False): setattr(module, name, value) try: django.conf.settings.configure(**settings) + if django.VERSION[0] == 1 and django.VERSION[1] >= 7: + django.setup() # pylint: disable=E1101 except RuntimeError: if not silent: logger.warning("Failed to finalize Django settings: %s" % @@ -204,7 +206,6 @@ def migrate_databases(**kwargs): for database in settings['DATABASES']: logger.debug("Migrating database %s" % (database)) if django.VERSION[0] == 1 and django.VERSION[1] >= 7: - django.setup() # pylint: disable=E1101 if initial_django_migration(database): logger.warning( "No applied django migrations found for database %s. " |