aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/gmg_commands/import_export.py
diff options
context:
space:
mode:
authorChristopher Allan Webber <cwebber@dustycloud.org>2013-08-12 11:13:00 -0500
committerRodney Ewing <ewing.rj@gmail.com>2013-08-16 15:30:17 -0700
commitff12ecef347d0fdb29534eb2bc0390cf183c10ba (patch)
treedd027adea346e60d35383131b380778ce44676cb /mediagoblin/gmg_commands/import_export.py
parent98d1fa3beddfc602c541fe7f538ca882ad6c7e9c (diff)
downloadmediagoblin-ff12ecef347d0fdb29534eb2bc0390cf183c10ba.tar.lz
mediagoblin-ff12ecef347d0fdb29534eb2bc0390cf183c10ba.tar.xz
mediagoblin-ff12ecef347d0fdb29534eb2bc0390cf183c10ba.zip
Revert "use parser.parse_known_args() instead of parser.parse_args()"
This reverts commit 029e779c468ba1a6bfd893679cfaae7f418f45dd. (and a bit more!) This wasn't needed anymore because we did a "rest" capture and passed that over to the reprocess run command. Conflicts: mediagoblin/gmg_commands/assetlink.py mediagoblin/gmg_commands/dbupdate.py mediagoblin/gmg_commands/import_export.py mediagoblin/gmg_commands/users.py
Diffstat (limited to 'mediagoblin/gmg_commands/import_export.py')
-rw-r--r--mediagoblin/gmg_commands/import_export.py27
1 files changed, 13 insertions, 14 deletions
diff --git a/mediagoblin/gmg_commands/import_export.py b/mediagoblin/gmg_commands/import_export.py
index 1d4ae1f7..fbac09f6 100644
--- a/mediagoblin/gmg_commands/import_export.py
+++ b/mediagoblin/gmg_commands/import_export.py
@@ -97,28 +97,27 @@ def env_import(args):
'''
Restore mongo database and media files from a tar archive
'''
- commands_util.check_unrecognized_args(args)
- if not args[0].cache_path:
- args[0].cache_path = tempfile.mkdtemp()
+ if not args.cache_path:
+ args.cache_path = tempfile.mkdtemp()
- setup_global_and_app_config(args[0].conf_file)
+ setup_global_and_app_config(args.conf_file)
# Creates mg_globals.public_store and mg_globals.queue_store
setup_storage()
- global_config, app_config = setup_global_and_app_config(args[0].conf_file)
+ global_config, app_config = setup_global_and_app_config(args.conf_file)
db = setup_connection_and_db_from_config(
app_config)
tf = tarfile.open(
- args[0].tar_file,
+ args.tar_file,
mode='r|gz')
- tf.extractall(args[0].cache_path)
+ tf.extractall(args.cache_path)
- args[0].cache_path = os.path.join(
- args[0].cache_path, 'mediagoblin-data')
- args = _setup_paths(args[0])
+ args.cache_path = os.path.join(
+ args.cache_path, 'mediagoblin-data')
+ args = _setup_paths(args)
# Import database from extracted data
_import_database(db, args)
@@ -227,16 +226,16 @@ def env_export(args):
'''
commands_util.check_unrecognized_args(args)
if args.cache_path:
- if os.path.exists(args[0].cache_path):
+ if os.path.exists(args.cache_path):
_log.error('The cache directory must not exist '
'before you run this script')
- _log.error('Cache directory: {0}'.format(args[0].cache_path))
+ _log.error('Cache directory: {0}'.format(args.cache_path))
return False
else:
- args[0].cache_path = tempfile.mkdtemp()
+ args.cache_path = tempfile.mkdtemp()
- args = _setup_paths(args[0])
+ args = _setup_paths(args)
if not _export_check(args):
_log.error('Checks did not pass, exiting')