From 6683bdd959bb27d02bdb67cd77d05b311a79ab72 Mon Sep 17 00:00:00 2001
From: Antoine Nguyen <tonio@ngyn.org>
Date: Mon, 20 May 2013 14:41:50 +0200
Subject: [PATCH] Order is important.

---
 modoboa/admin/migrations/0015_move_passwords.py |  3 +++
 modoboa/core/templates/settings.py              | 14 ++++++++------
 modoboa/extensions/__init__.py                  |  2 +-
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/modoboa/admin/migrations/0015_move_passwords.py b/modoboa/admin/migrations/0015_move_passwords.py
index 06d138233..3686fbaf7 100644
--- a/modoboa/admin/migrations/0015_move_passwords.py
+++ b/modoboa/admin/migrations/0015_move_passwords.py
@@ -5,12 +5,15 @@ from south.v2 import DataMigration
 from django.db import models
 from modoboa.lib.models import Parameter
 from modoboa.lib.compat import user_model_name
+from modoboa.lib.dbutils import db_table_exists
 
 
 class Migration(DataMigration):
 
     def forwards(self, orm):
         "Write your forwards methods here."
+        if not db_table_exists("lib_parameter"):
+            return
         try:
             s = Parameter.objects.get(name='admin.PASSWORD_SCHEME').value
         except Parameter.DoesNotExist:
diff --git a/modoboa/core/templates/settings.py b/modoboa/core/templates/settings.py
index 4a6197b52..2a721f2e1 100644
--- a/modoboa/core/templates/settings.py
+++ b/modoboa/core/templates/settings.py
@@ -138,19 +138,21 @@ INSTALLED_APPS = (
     # 'django.contrib.admindocs',
     'reversion',
     'south',
-    'modoboa',
-    'modoboa.auth',
-    'modoboa.lib',
 
     # Extra tools
     # 'modoboa.tools.pfxadmin_migrate',
 )
 
-MODOBOA_EXTENSIONS = (
+# A dedicated place to register Modoboa applications
+# Do not delete it.
+# Do not change the order.
+MODOBOA_APPS = (
+    'modoboa',
+    'modoboa.auth',
     'modoboa.admin',
+    'modoboa.lib',
     'modoboa.userprefs',
 
-    # Modoboa extensions here.
     'modoboa.extensions.limits',
     'modoboa.extensions.postfix_autoreply',
     'modoboa.extensions.webmail',
@@ -159,7 +161,7 @@ MODOBOA_EXTENSIONS = (
     'modoboa.extensions.sievefilters',
 )
 
-INSTALLED_APPS += MODOBOA_EXTENSIONS
+INSTALLED_APPS += MODOBOA_APPS
 
 AUTH_USER_MODEL = 'admin.User'
 
diff --git a/modoboa/extensions/__init__.py b/modoboa/extensions/__init__.py
index cb6bdf41b..e8bddb244 100644
--- a/modoboa/extensions/__init__.py
+++ b/modoboa/extensions/__init__.py
@@ -56,7 +56,7 @@ class ExtensionsPool(object):
     def load_all(self):
         from modoboa.admin.models import Extension
 
-        for ext in settings.MODOBOA_EXTENSIONS:
+        for ext in settings.MODOBOA_APPS:
             __import__(ext)
         result = []
         for extname in self.extensions.keys():