[cli] remove superfluous trailing space from help (#74551)

Change:
- After we output the newline in help text, we also added a space. This
  caused either a space to show up before the shell prompt (in shells
  like bash), or " %" and a newline before the next prompt on shells
  like zsh that automatically force commands to end with a newline.
- This change removes the extra space, so that peace can be restored in
  the minds of many.
- This only showed up when running commands with no arguments or invalid
  arguments.

Test Plan:
- Ran `ansible`, `ansible -h`, `ansible-playbook`, `ansible-galaxy`, and
  `ansible-galaxy -h`.

Tickets:
- Introduced in #69458

Signed-off-by: Rick Elrod <rick@elrod.me>
This commit is contained in:
Rick Elrod 2021-05-04 10:42:17 -05:00 committed by GitHub
parent c6fda9fc1a
commit b0389c7f11
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 1 deletions

View file

@ -0,0 +1,2 @@
minor_changes:
- cli scripts - remove trailing blank space in help after newline when outputting.

View file

@ -375,7 +375,7 @@ class CLI(with_metaclass(ABCMeta, object)):
options = self.parser.parse_args(self.args[1:]) options = self.parser.parse_args(self.args[1:])
except SystemExit as e: except SystemExit as e:
if(e.code != 0): if(e.code != 0):
self.parser.exit(status=2, message=" \n%s " % self.parser.format_help()) self.parser.exit(status=2, message=" \n%s" % self.parser.format_help())
raise raise
options = self.post_process_args(options) options = self.post_process_args(options)
context._init_global_context(options) context._init_global_context(options)