From 07672ad6e6985b029c0ccf750f63576b488b95d7 Mon Sep 17 00:00:00 2001 From: Jonas Jochmaring Date: Mon, 6 Jul 2015 14:51:48 +0200 Subject: some more django 1.7 compatibility fixes --- src/lib/Bcfg2/Server/Admin.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src/lib/Bcfg2/Server/Admin.py') diff --git a/src/lib/Bcfg2/Server/Admin.py b/src/lib/Bcfg2/Server/Admin.py index 0eba843c7..b7ee0c0ed 100644 --- a/src/lib/Bcfg2/Server/Admin.py +++ b/src/lib/Bcfg2/Server/Admin.py @@ -32,7 +32,7 @@ try: HAS_DJANGO = True if django.VERSION[0] == 1 and django.VERSION[1] >= 7: HAS_REPORTS = True - elif django.VERSION[0] == 1 and django.VERSION[1] <= 6: + else: try: import south # pylint: disable=W0611 HAS_REPORTS = True @@ -904,6 +904,9 @@ if HAS_DJANGO: class Syncdb(AdminCmd): """ Sync the Django ORM with the configured database """ + if HAS_DJANGO and django.VERSION[0] == 1 and django.VERSION[1] >= 7: + django.setup() + def run(self, setup): Bcfg2.Server.models.load_models() try: -- cgit v1.2.3-1-g7c22