diff options
| author | Christopher Allan Webber <cwebber@dustycloud.org> | 2012-03-18 12:12:41 -0500 |
|---|---|---|
| committer | Christopher Allan Webber <cwebber@dustycloud.org> | 2012-03-18 12:12:41 -0500 |
| commit | 94e605237512daa518bcab9b59edbc1107840006 (patch) | |
| tree | eb1aa0b714c536f68474f0853c251ed4c5d683cf /mediagoblin/gmg_commands/migrate.py | |
| parent | bf0f67ad6547e2073770942ddf66f23d3181831a (diff) | |
| parent | 54477b4d76ca983e2e884fea9c0975c7e63fdc1d (diff) | |
| download | mediagoblin-94e605237512daa518bcab9b59edbc1107840006.tar.lz mediagoblin-94e605237512daa518bcab9b59edbc1107840006.tar.xz mediagoblin-94e605237512daa518bcab9b59edbc1107840006.zip | |
Merge branch 'master' into derek-moore-bug405_email_notifications_for_comments
Conflicts:
mediagoblin/db/mongo/migrations.py
Diffstat (limited to 'mediagoblin/gmg_commands/migrate.py')
| -rw-r--r-- | mediagoblin/gmg_commands/migrate.py | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/mediagoblin/gmg_commands/migrate.py b/mediagoblin/gmg_commands/migrate.py index cacf5d19..af541786 100644 --- a/mediagoblin/gmg_commands/migrate.py +++ b/mediagoblin/gmg_commands/migrate.py @@ -17,7 +17,7 @@ import sys from mediagoblin.db.mongo import util as db_util -from mediagoblin.db.open import setup_connection_and_db_from_config +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! @@ -41,7 +41,12 @@ def _print_finished_migration(migration_number, migration_func): def migrate(args): - global_config, app_config = setup_global_and_app_config(args.conf_file) + run_migrate(args.conf_file) + + +def run_migrate(conf_file): + global_config, app_config = setup_global_and_app_config(conf_file) + connection, db = setup_connection_and_db_from_config( app_config, use_pymongo=True) migration_manager = db_util.MigrationManager(db) |