aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mediagoblin/gmg_commands/__init__.py3
-rw-r--r--mediagoblin/gmg_commands/import_export.py3
-rw-r--r--mediagoblin/gmg_commands/migrate.py4
-rw-r--r--mediagoblin/gmg_commands/shell.py4
-rw-r--r--mediagoblin/gmg_commands/users.py9
5 files changed, 5 insertions, 18 deletions
diff --git a/mediagoblin/gmg_commands/__init__.py b/mediagoblin/gmg_commands/__init__.py
index 92ae840e..6c7450cb 100644
--- a/mediagoblin/gmg_commands/__init__.py
+++ b/mediagoblin/gmg_commands/__init__.py
@@ -58,6 +58,9 @@ SUBCOMMAND_MAP = {
def main_cli():
parser = argparse.ArgumentParser(
description='GNU MediaGoblin utilities.')
+ parser.add_argument(
+ '-cf', '--conf_file', default='mediagoblin.ini',
+ help="Config file used to set up environment")
subparsers = parser.add_subparsers(help='sub-command help')
for command_name, command_struct in SUBCOMMAND_MAP.iteritems():
diff --git a/mediagoblin/gmg_commands/import_export.py b/mediagoblin/gmg_commands/import_export.py
index 05edbfc8..78d30713 100644
--- a/mediagoblin/gmg_commands/import_export.py
+++ b/mediagoblin/gmg_commands/import_export.py
@@ -40,9 +40,6 @@ def import_export_parse_setup(subparser):
subparser.add_argument(
'tar_file')
subparser.add_argument(
- '-cf', '--conf_file', default='mediagoblin.ini',
- help='Config file used to set up environment')
- subparser.add_argument(
'--mongodump_path', default='mongodump',
help='mongodump binary')
subparser.add_argument(
diff --git a/mediagoblin/gmg_commands/migrate.py b/mediagoblin/gmg_commands/migrate.py
index 1a597188..fad9b363 100644
--- a/mediagoblin/gmg_commands/migrate.py
+++ b/mediagoblin/gmg_commands/migrate.py
@@ -25,9 +25,7 @@ from mediagoblin.db import migrations
def migrate_parser_setup(subparser):
- subparser.add_argument(
- '-cf', '--conf_file', default='mediagoblin.ini',
- help="Config file used to set up environment")
+ pass
def _print_started_migration(migration_number, migration_func):
diff --git a/mediagoblin/gmg_commands/shell.py b/mediagoblin/gmg_commands/shell.py
index 2a380c7b..910560a0 100644
--- a/mediagoblin/gmg_commands/shell.py
+++ b/mediagoblin/gmg_commands/shell.py
@@ -22,9 +22,7 @@ from mediagoblin.gmg_commands import util as commands_util
def shell_parser_setup(subparser):
- subparser.add_argument(
- '-cf', '--conf_file', default='mediagoblin.ini',
- help="Config file used to set up environment")
+ pass
SHELL_BANNER = """\
diff --git a/mediagoblin/gmg_commands/users.py b/mediagoblin/gmg_commands/users.py
index 5421907d..345c3e5c 100644
--- a/mediagoblin/gmg_commands/users.py
+++ b/mediagoblin/gmg_commands/users.py
@@ -29,9 +29,6 @@ def adduser_parser_setup(subparser):
subparser.add_argument(
'email',
help="Email to recieve notifications")
- subparser.add_argument(
- '-cf', '--conf_file', default='mediagoblin.ini',
- help="Config file used to set up environment")
def adduser(args):
@@ -64,9 +61,6 @@ def makeadmin_parser_setup(subparser):
subparser.add_argument(
'username',
help="Username to give admin level")
- subparser.add_argument(
- '-cf', '--conf_file', default='mediagoblin.ini',
- help="Config file used to set up environment")
def makeadmin(args):
@@ -90,9 +84,6 @@ def changepw_parser_setup(subparser):
subparser.add_argument(
'password',
help="Your NEW supersecret word to login")
- subparser.add_argument(
- '-cf', '--conf_file', default='mediagoblin.ini',
- help="Config file used to set up environment")
def changepw(args):