From 1c6398dd3b03d5dc1e44cfb347bba46f883a673c Mon Sep 17 00:00:00 2001 From: Michael DeHaan Date: Tue, 5 Aug 2014 20:40:01 -0400 Subject: [PATCH] Resolve option conflict differently. --- lib/ansible/utils/module_docs.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/lib/ansible/utils/module_docs.py b/lib/ansible/utils/module_docs.py index bb91c557fc0..3983efd508b 100644 --- a/lib/ansible/utils/module_docs.py +++ b/lib/ansible/utils/module_docs.py @@ -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