aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/gmg_commands/__init__.py
diff options
context:
space:
mode:
authorChristopher Allan Webber <cwebber@dustycloud.org>2011-10-23 15:22:18 -0500
committerChristopher Allan Webber <cwebber@dustycloud.org>2011-10-23 15:22:18 -0500
commitc0e1a7097588076738bdae3191d97f95d0780025 (patch)
tree6070c40054059c80b733b0ea848a8d6805cdf547 /mediagoblin/gmg_commands/__init__.py
parent4b186b7398503cfb027c8a27223f70bfc79a7bab (diff)
parent15ac1458edfe703688cfe1e5eb36a2e90f5194c6 (diff)
downloadmediagoblin-c0e1a7097588076738bdae3191d97f95d0780025.tar.lz
mediagoblin-c0e1a7097588076738bdae3191d97f95d0780025.tar.xz
mediagoblin-c0e1a7097588076738bdae3191d97f95d0780025.zip
Merge remote branch 'remotes/elrond/refactor/gmg_cf_option'
Diffstat (limited to 'mediagoblin/gmg_commands/__init__.py')
-rw-r--r--mediagoblin/gmg_commands/__init__.py3
1 files changed, 3 insertions, 0 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():