From 5cac5389b06d74b3820379158f37863f69014826 Mon Sep 17 00:00:00 2001 From: Alexander Sulfrian Date: Tue, 17 Nov 2015 01:01:26 +0100 Subject: Metadata: Add fix for django1.7 The Metadata database backend also uses django1.7 and we have to run django.setup() here, too. --- src/lib/Bcfg2/Server/Plugins/Metadata.py | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src') 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""" -- cgit v1.2.3-1-g7c22