diff options
| author | Alexander Sulfrian <alexander@sulfrian.net> | 2016-07-17 14:19:44 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-17 14:19:44 +0200 |
| commit | a25d871158f49b9b5b86303058de24c763dc2590 (patch) | |
| tree | 5fb9fb841ead0262e88afa01798f8c9cba6044d3 /src/lib/Bcfg2/Server | |
| parent | 6882df7d2f38cae19a0b68ac0278a8899ca4d3f5 (diff) | |
| parent | f4e52ab2980a5618f5121be360361ad45d438482 (diff) | |
| download | bcfg2-a25d871158f49b9b5b86303058de24c763dc2590.tar.gz bcfg2-a25d871158f49b9b5b86303058de24c763dc2590.tar.bz2 bcfg2-a25d871158f49b9b5b86303058de24c763dc2590.zip | |
Merge pull request #320 from AlexanderS/fix/more-django-fixes
Some more django fixes
Diffstat (limited to 'src/lib/Bcfg2/Server')
| -rw-r--r-- | src/lib/Bcfg2/Server/Plugins/Metadata.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/lib/Bcfg2/Server/Plugins/Metadata.py b/src/lib/Bcfg2/Server/Plugins/Metadata.py index 657e4df31..30f60fffe 100644 --- a/src/lib/Bcfg2/Server/Plugins/Metadata.py +++ b/src/lib/Bcfg2/Server/Plugins/Metadata.py @@ -35,6 +35,7 @@ def load_django_models(): # pylint: enable=W0602 try: + import django from django.db import models HAS_DJANGO = True except ImportError: @@ -99,6 +100,9 @@ def load_django_models(): except MetadataClientModel.DoesNotExist: return False + if django.VERSION[0] == 1 and django.VERSION[1] >= 7: + django.setup() # pylint: disable=E1101 + class XMLMetadataConfig(Bcfg2.Server.Plugin.XMLFileBacked): """Handles xml config files and all XInclude statements""" |