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

Merge pull request #10269 from danrue/unarchive_creates_behavior

Browse source 
Make behavior consistent when using 'creates' option with modules
This commit is contained in:
Toshio Kuratomi 2015-02-17 23:04:26 -08:00
commit 9bb8e60ed1
3 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/ansible/runner/action_plugins/script.py
View file

@ -66,7 +66,7 @@ class ActionModule(object):
conn=conn, conn=conn,
comm_ok=True, comm_ok=True,
result=dict( result=dict(
skipped=True, changed=False,
msg=("skipped, since %s exists" % creates) msg=("skipped, since %s exists" % creates)
) )
) )
@ -83,7 +83,7 @@ class ActionModule(object):
conn=conn, conn=conn,
comm_ok=True, comm_ok=True,
result=dict( result=dict(
skipped=True, changed=False,
msg=("skipped, since %s does not exist" % removes) msg=("skipped, since %s does not exist" % removes)
) )
) )

1
lib/ansible/runner/action_plugins/unarchive.py
View file

@ -69,7 +69,6 @@ class ActionModule(object):
conn=conn, conn=conn,
comm_ok=True, comm_ok=True,
result=dict( result=dict(
skipped=True,
changed=False, changed=False,
msg=("skipped, since %s exists" % creates) msg=("skipped, since %s exists" % creates)
) )

2
test/integration/roles/test_unarchive/tasks/main.yml
View file

@ -96,7 +96,6 @@
assert: assert:
that: that:
- "unarchive02c.changed == false" - "unarchive02c.changed == false"
- "unarchive02c.skipped == true"
- name: unarchive a tar.gz file with creates over an existing file using complex_args - name: unarchive a tar.gz file with creates over an existing file using complex_args
unarchive: unarchive:
@ -110,7 +109,6 @@
assert: assert:
that: that:
- "unarchive02d.changed == false" - "unarchive02d.changed == false"
- "unarchive02d.skipped == true"
- name: remove our tar.gz unarchive destination - name: remove our tar.gz unarchive destination
file: path={{output_dir}}/test-unarchive-tar-gz state=absent file: path={{output_dir}}/test-unarchive-tar-gz state=absent