From: Elrond <elrond+mediagoblin.org@samba-tng.org>
Date: Sun, 23 Oct 2011 21:29:15 +0000 (+0200)
Subject: Use setup_global_and_app_config in gmg's migrate.
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=5568a014195fa9f39021033a6ba2706125bb13ed;p=mediagoblin.git

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.
---

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