Deprecate ./bin/gmg migrate.

Keeping it around just in case someone manually wants to migrate
before running the convert thing or... something.  Probably silly.

diff --git a/mediagoblin/gmg_commands/__init__.py b/mediagoblin/gmg_commands/__init__.py
index 85bab510a317a9bc972127ab43a18e54a3565458..4a608a695d92e963cbc082348630e00746c5bb2a 100644 (file)
--- a/mediagoblin/gmg_commands/__init__.py
+++ b/mediagoblin/gmg_commands/__init__.py
@@ -28,7 +28,8 @@ SUBCOMMAND_MAP = {
     'migrate': {
         'setup': 'mediagoblin.gmg_commands.migrate:migrate_parser_setup',
         'func': 'mediagoblin.gmg_commands.migrate:migrate',
-        'help': 'Apply all unapplied bulk migrations to the database'},
+        'help': ('Migrate your Mongo database. '
+                 '[DEPRECATED!] use convert_mongo_to_sql and dbupdate.')},
     'adduser': {
         'setup': 'mediagoblin.gmg_commands.users:adduser_parser_setup',
         'func': 'mediagoblin.gmg_commands.users:adduser',

diff --git a/mediagoblin/gmg_commands/migrate.py b/mediagoblin/gmg_commands/migrate.py
index af5417863bae75c4ead9ae81806d28a5f90a45f7..b915a5288edb730f7c5f3bfaf80cead163fe3d72 100644 (file)
--- a/mediagoblin/gmg_commands/migrate.py
+++ b/mediagoblin/gmg_commands/migrate.py
@@ -16,13 +16,8 @@
 
 import sys
 
-from mediagoblin.db.mongo import util as db_util
-from mediagoblin.db.mongo.open import setup_connection_and_db_from_config
 from mediagoblin.init import setup_global_and_app_config
 
-# This MUST be imported so as to set up the appropriate migrations!
-from mediagoblin.db.mongo import migrations
-
 
 def migrate_parser_setup(subparser):
     pass
@@ -45,6 +40,12 @@ def migrate(args):
 
 
 def run_migrate(conf_file):
+    # This MUST be imported so as to set up the appropriate migrations!
+    from mediagoblin.db.mongo import migrations
+
+    from mediagoblin.db.mongo import util as db_util
+    from mediagoblin.db.mongo.open import setup_connection_and_db_from_config
+
     global_config, app_config = setup_global_and_app_config(conf_file)
 
     connection, db = setup_connection_and_db_from_config(