diff options
| author | Brandon Invergo <brandon@invergo.net> | 2013-05-19 13:23:17 +0200 |
|---|---|---|
| committer | Brandon Invergo <brandon@invergo.net> | 2013-05-19 13:23:17 +0200 |
| commit | e02b7b6b3bd6b20c65aeb2ca5fd1e0030b631b88 (patch) | |
| tree | 988b9505a649f824f2ea53ac04bdfbc3a0da983a /mediagoblin/gmg_commands/import_export.py | |
| parent | 60c42337ef7bc9b4aec0d3f1b2cb5f19a09d9a7f (diff) | |
| parent | 041d2fd785f9b3e18f9fd758f91dbfa7715d317c (diff) | |
| download | mediagoblin-e02b7b6b3bd6b20c65aeb2ca5fd1e0030b631b88.tar.lz mediagoblin-e02b7b6b3bd6b20c65aeb2ca5fd1e0030b631b88.tar.xz mediagoblin-e02b7b6b3bd6b20c65aeb2ca5fd1e0030b631b88.zip | |
Merge branch 'master' of git://gitorious.org/mediagoblin/mediagoblin
Diffstat (limited to 'mediagoblin/gmg_commands/import_export.py')
| -rw-r--r-- | mediagoblin/gmg_commands/import_export.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/mediagoblin/gmg_commands/import_export.py b/mediagoblin/gmg_commands/import_export.py index 72ebd8a8..d51a1e3e 100644 --- a/mediagoblin/gmg_commands/import_export.py +++ b/mediagoblin/gmg_commands/import_export.py @@ -105,7 +105,7 @@ def env_import(args): setup_storage() global_config, app_config = setup_global_and_app_config(args.conf_file) - connection, db = setup_connection_and_db_from_config( + db = setup_connection_and_db_from_config( app_config) tf = tarfile.open( @@ -243,8 +243,7 @@ def env_export(args): setup_storage() - connection, db = setup_connection_and_db_from_config( - app_config) + db = setup_connection_and_db_from_config(app_config) _export_database(db, args) |