# HG changeset patch # User Pascal Volk # Date 1295484069 0 # Node ID 2af61bc062159511db3c72ff731329fc63190960 # Parent 4cbaf8d229f9ac4a144663fce92f4a1e93387392 VMM/cli/subcommands: Update also the RunContext's subcommand if 'plan A' in {alias,relocated,user}_info() fails. diff -r 4cbaf8d229f9 -r 2af61bc06215 VirtualMailManager/cli/subcommands.py --- a/VirtualMailManager/cli/subcommands.py Thu Jan 20 00:22:52 2011 +0000 +++ b/VirtualMailManager/cli/subcommands.py Thu Jan 20 00:41:09 2011 +0000 @@ -114,12 +114,12 @@ if err.code is ACCOUNT_EXISTS: w_err(0, ctx.plan_a_b % {'subcommand': u'userinfo', 'object': address}) - ctx.args[1] = 'userinfo' + ctx.scmd = ctx.args[1] = 'userinfo' user_info(ctx) elif err.code is RELOCATED_EXISTS: w_std(0, ctx.plan_a_b % {'subcommand': u'relocatedinfo', 'object': address}) - ctx.args[1] = 'relocatedinfo' + ctx.scmd = ctx.args[1] = 'relocatedinfo' relocated_info(ctx) else: raise @@ -367,12 +367,12 @@ if err.code is ACCOUNT_EXISTS: w_err(0, ctx.plan_a_b % {'subcommand': u'userinfo', 'object': relocated}) - ctx.args[1] = 'userinfoi' + ctx.scmd = ctx.args[1] = 'userinfoi' user_info(ctx) elif err.code is ALIAS_EXISTS: w_err(0, ctx.plan_a_b % {'subcommand': u'aliasinfo', 'object': relocated}) - ctx.args[1] = 'aliasinfo' + ctx.scmd = ctx.args[1] = 'aliasinfo' alias_info(ctx) else: raise @@ -451,12 +451,12 @@ if err.code is ALIAS_EXISTS: w_err(0, ctx.plan_a_b % {'subcommand': u'aliasinfo', 'object': ctx.args[2].lower()}) - ctx.args[1] = 'aliasinfo' + ctx.scmd = ctx.args[1] = 'aliasinfo' alias_info(ctx) elif err.code is RELOCATED_EXISTS: w_err(0, ctx.plan_a_b % {'subcommand': u'relocatedinfo', 'object': ctx.args[2].lower()}) - ctx.args[1] = 'relocatedinfo' + ctx.scmd = ctx.args[1] = 'relocatedinfo' relocated_info(ctx) else: raise