cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #12463 from mgedmin/fix-ansible-doc

Browse source 
Fix option descriptions in ansible-doc output
This commit is contained in:
James Cammarata 2015-09-22 03:10:59 -04:00
commit d2949f5449
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -255,10 +255,10 @@ class DocCLI(CLI):
text.append("%s %s" % (opt_leadin, o)) text.append("%s %s" % (opt_leadin, o))
if isinstance(doc['description'], list): if isinstance(opt['description'], list):
desc = " ".join(doc['description']) desc = " ".join(opt['description'])
else: else:
desc = doc['description'] desc = opt['description']
if 'choices' in opt: if 'choices' in opt:
choices = ", ".join(str(i) for i in opt['choices']) choices = ", ".join(str(i) for i in opt['choices'])