wbrawner/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

be more tolerant with non list descriptions

Browse source
This commit is contained in:
Brian Coca 2015-08-27 14:55:01 -04:00
parent 86b2982005
commit 2b28cdc0dd
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/ansible/cli/doc.py
View file

@ -233,7 +233,10 @@ class DocCLI(CLI):
text = []
text.append("> %s\n" % doc['module'].upper())
if isinstance(doc['description'], list):
desc = " ".join(doc['description'])
else:
desc = doc['description']
text.append("%s\n" % textwrap.fill(CLI.tty_ify(desc), initial_indent=" ", subsequent_indent=" "))
@ -250,7 +253,10 @@ class DocCLI(CLI):
text.append("%s %s" % (opt_leadin, o))
desc = " ".join(opt['description'])
if isinstance(doc['description'], list):
desc = " ".join(doc['description'])
else:
desc = doc['description']
if 'choices' in opt:
choices = ", ".join(str(i) for i in opt['choices'])