From 431811eb36d9b1f5e754886481322eb2848e5dd0 Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber Date: Sat, 17 Mar 2012 12:31:11 -0500 Subject: Mongosql imports made celery get set up before we wanted it via ./bin/gmg commands Just moved the import into the actual function. That resolved the issue! --- mediagoblin/gmg_commands/mongosql.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'mediagoblin/gmg_commands/mongosql.py') diff --git a/mediagoblin/gmg_commands/mongosql.py b/mediagoblin/gmg_commands/mongosql.py index a25263e2..81a2830c 100644 --- a/mediagoblin/gmg_commands/mongosql.py +++ b/mediagoblin/gmg_commands/mongosql.py @@ -14,12 +14,11 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . -from mediagoblin.db.sql.convert import run_conversion - def mongosql_parser_setup(subparser): pass def mongosql(args): + from mediagoblin.db.sql.convert import run_conversion run_conversion(args.conf_file) -- cgit v1.2.3 From 9e55431143e48d0ee923e5b6904f450ccf3ca903 Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber Date: Sat, 17 Mar 2012 17:08:46 -0500 Subject: mongo->sql conversion script now runs mongo migrations first, just in case --- mediagoblin/gmg_commands/mongosql.py | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'mediagoblin/gmg_commands/mongosql.py') diff --git a/mediagoblin/gmg_commands/mongosql.py b/mediagoblin/gmg_commands/mongosql.py index 81a2830c..dd53f575 100644 --- a/mediagoblin/gmg_commands/mongosql.py +++ b/mediagoblin/gmg_commands/mongosql.py @@ -20,5 +20,9 @@ def mongosql_parser_setup(subparser): def mongosql(args): + # First, make sure our mongo migrations are up to date... + from mediagoblin.gmg_commands.migrate import run_migrate + run_migrate(args.conf_file) + from mediagoblin.db.sql.convert import run_conversion run_conversion(args.conf_file) -- cgit v1.2.3