aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/gmg_commands/import_export.py
diff options
context:
space:
mode:
authortilly-Q <nattilypigeonfowl@gmail.com>2013-09-12 18:58:04 -0400
committertilly-Q <nattilypigeonfowl@gmail.com>2013-09-12 18:58:04 -0400
commit045fe0ee9d43aa825de6fbf14fe8fd48953d4eff (patch)
treee0743c13e20845a613ba8e4064cb1e0f10f54025 /mediagoblin/gmg_commands/import_export.py
parenta02831687a6026b2baa0f971ecb3e594c3f415e2 (diff)
parent66cafc3b74d476710013efb46341b989028f3057 (diff)
downloadmediagoblin-045fe0ee9d43aa825de6fbf14fe8fd48953d4eff.tar.lz
mediagoblin-045fe0ee9d43aa825de6fbf14fe8fd48953d4eff.tar.xz
mediagoblin-045fe0ee9d43aa825de6fbf14fe8fd48953d4eff.zip
Merge branch 'master' into OPW-Moderation-Update
Conflicts: mediagoblin/db/migrations.py
Diffstat (limited to 'mediagoblin/gmg_commands/import_export.py')
-rw-r--r--mediagoblin/gmg_commands/import_export.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/mediagoblin/gmg_commands/import_export.py b/mediagoblin/gmg_commands/import_export.py
index 98ec617d..fbac09f6 100644
--- a/mediagoblin/gmg_commands/import_export.py
+++ b/mediagoblin/gmg_commands/import_export.py
@@ -16,6 +16,7 @@
from mediagoblin import mg_globals
from mediagoblin.db.open import setup_connection_and_db_from_config
+from mediagoblin.gmg_commands import util as commands_util
from mediagoblin.storage.filestorage import BasicFileStorage
from mediagoblin.init import setup_storage, setup_global_and_app_config
@@ -223,6 +224,7 @@ def env_export(args):
'''
Export database and media files to a tar archive
'''
+ commands_util.check_unrecognized_args(args)
if args.cache_path:
if os.path.exists(args.cache_path):
_log.error('The cache directory must not exist '