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

Resolve option conflict differently.

Browse source
This commit is contained in:
Michael DeHaan 2014-08-05 20:40:01 -04:00
parent f24e335d0f
commit 1c6398dd3b
1 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/ansible/utils/module_docs.py
View file

@ -85,9 +85,7 @@ def get_docstring(filename, verbose=False):
if not doc.has_key(key):
doc[key] = value
else:
# not sure this is the only example but don't do this for the copy module
if key != 'force':
doc[key].update(value)
doc[key].update(value)
if 'EXAMPLES' in (t.id for t in child.targets):
plainexamples = child.value.s[1:] # Skip first empty line