aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mediagoblin/app.py3
-rw-r--r--mediagoblin/gmg_commands/migrate.py4
2 files changed, 6 insertions, 1 deletions
diff --git a/mediagoblin/app.py b/mediagoblin/app.py
index 7a6a1f33..1c38f778 100644
--- a/mediagoblin/app.py
+++ b/mediagoblin/app.py
@@ -28,6 +28,9 @@ from mediagoblin.init.celery import setup_celery_from_config
from mediagoblin.init import get_jinja_loader, get_staticdirector, \
setup_global_and_app_config, setup_workbench
+# This MUST be imported so as to set up the appropriate migrations!
+from mediagoblin.db import migrations
+
class MediaGoblinApp(object):
"""
diff --git a/mediagoblin/gmg_commands/migrate.py b/mediagoblin/gmg_commands/migrate.py
index e8d43a1f..94adc9e0 100644
--- a/mediagoblin/gmg_commands/migrate.py
+++ b/mediagoblin/gmg_commands/migrate.py
@@ -16,11 +16,13 @@
import sys
-from mediagoblin.db import migrations
from mediagoblin.db import util as db_util
from mediagoblin.db.open import setup_connection_and_db_from_config
from mediagoblin.init.config import read_mediagoblin_config
+# This MUST be imported so as to set up the appropriate migrations!
+from mediagoblin.db import migrations
+
def migrate_parser_setup(subparser):
subparser.add_argument(