diff options
| author | Elrond <elrond+mediagoblin.org@samba-tng.org> | 2011-10-23 23:29:15 +0200 |
|---|---|---|
| committer | Elrond <elrond+mediagoblin.org@samba-tng.org> | 2011-11-26 11:50:25 +0100 |
| commit | 5568a014195fa9f39021033a6ba2706125bb13ed (patch) | |
| tree | fa60c6e47349305366f225795e47cc48950fc720 | |
| parent | 56dc1c9d3eb73b86bf8e165ffc79ad4929239603 (diff) | |
| download | mediagoblin-5568a014195fa9f39021033a6ba2706125bb13ed.tar.lz mediagoblin-5568a014195fa9f39021033a6ba2706125bb13ed.tar.xz mediagoblin-5568a014195fa9f39021033a6ba2706125bb13ed.zip | |
Use setup_global_and_app_config in gmg's migrate.
Instead of using read_mediagoblin_config, forgetting to
check the validation report and then finding the main app
section by hand, just use setup_global_and_app_config.
| -rw-r--r-- | mediagoblin/gmg_commands/migrate.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mediagoblin/gmg_commands/migrate.py b/mediagoblin/gmg_commands/migrate.py index beea109d..bd3bcb20 100644 --- a/mediagoblin/gmg_commands/migrate.py +++ b/mediagoblin/gmg_commands/migrate.py @@ -18,7 +18,7 @@ import sys 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 +from mediagoblin.init import setup_global_and_app_config # This MUST be imported so as to set up the appropriate migrations! from mediagoblin.db import migrations @@ -41,9 +41,9 @@ def _print_finished_migration(migration_number, migration_func): def migrate(args): - config, validation_result = read_mediagoblin_config(args.conf_file) + global_config, app_config = setup_global_and_app_config(args.conf_file) connection, db = setup_connection_and_db_from_config( - config['mediagoblin'], use_pymongo=True) + app_config, use_pymongo=True) migration_manager = db_util.MigrationManager(db) # Clear old indexes |