diff options
| author | tilly-Q <nattilypigeonfowl@gmail.com> | 2014-05-13 15:24:59 -0400 |
|---|---|---|
| committer | tilly-Q <nattilypigeonfowl@gmail.com> | 2014-05-13 15:24:59 -0400 |
| commit | 1d09e8b4f1be938a3415329f4fd93e4f6936b16a (patch) | |
| tree | b14feac978e2bbd2eb9f79a81ce220cf51356f76 /mediagoblin/gmg_commands/__init__.py | |
| parent | b5dd2459893fd1e7ae1376a7573a36bf15c983f7 (diff) | |
| parent | cc7c9091acf4103d5a0e9a910eeb07bfb01b2916 (diff) | |
| download | mediagoblin-1d09e8b4f1be938a3415329f4fd93e4f6936b16a.tar.lz mediagoblin-1d09e8b4f1be938a3415329f4fd93e4f6936b16a.tar.xz mediagoblin-1d09e8b4f1be938a3415329f4fd93e4f6936b16a.zip | |
Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin into metadata
Conflicts:
mediagoblin/gmg_commands/__init__.py
Diffstat (limited to 'mediagoblin/gmg_commands/__init__.py')
| -rw-r--r-- | mediagoblin/gmg_commands/__init__.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/mediagoblin/gmg_commands/__init__.py b/mediagoblin/gmg_commands/__init__.py index 55e85116..fd546aac 100644 --- a/mediagoblin/gmg_commands/__init__.py +++ b/mediagoblin/gmg_commands/__init__.py @@ -53,10 +53,14 @@ SUBCOMMAND_MAP = { 'setup': 'mediagoblin.gmg_commands.addmedia:parser_setup', 'func': 'mediagoblin.gmg_commands.addmedia:addmedia', 'help': 'Reprocess media entries'}, + 'deletemedia': { + 'setup': 'mediagoblin.gmg_commands.deletemedia:parser_setup', + 'func': 'mediagoblin.gmg_commands.deletemedia:deletemedia', + 'help': 'Delete media entries'}, 'batchaddmedia': { 'setup': 'mediagoblin.gmg_commands.batchaddmedia:parser_setup', 'func': 'mediagoblin.gmg_commands.batchaddmedia:batchaddmedia', - 'help': 'Add many media entries at once'} + 'help': 'Add many media entries at once'}, # 'theme': { # 'setup': 'mediagoblin.gmg_commands.theme:theme_parser_setup', # 'func': 'mediagoblin.gmg_commands.theme:theme', |