From 2c509b7fa1e6018d240583c3656d461a3222b53d Mon Sep 17 00:00:00 2001 From: Sushil Kumar Date: Thu, 12 Dec 2013 14:07:01 +0000 Subject: [PATCH] Fixes trove help command Reason: - trove help output misplaces the position of " ..." from bottom to top. - This behavior is because of formatting done to Print positionals before optionals. Changes: - Sequence fixed in trove help output. Change-Id: I8aff2eec9f915a7ec1960b67ee7ba8423624aad6 Closes-Bug: #1260332 --- troveclient/shell.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/troveclient/shell.py b/troveclient/shell.py index 8cbf5d4e..aba52182 100644 --- a/troveclient/shell.py +++ b/troveclient/shell.py @@ -614,8 +614,15 @@ class OpenStackHelpFormatter(argparse.HelpFormatter): if len(prefix) + len(prog) <= 0.75 * text_width: indent = ' ' * (len(prefix) + len(prog) + 1) if pos_parts: - lines = get_lines([prog] + pos_parts, indent, prefix) - lines.extend(get_lines(opt_parts, indent)) + if prog == 'trove': + # "trove help" called without any subcommand + lines = get_lines([prog] + opt_parts, indent, + prefix) + lines.extend(get_lines(pos_parts, indent)) + else: + lines = get_lines([prog] + pos_parts, indent, + prefix) + lines.extend(get_lines(opt_parts, indent)) elif opt_parts: lines = get_lines([prog] + opt_parts, indent, prefix) else: