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

Fix file module with check_mode - Fixes #42111 (#42115)

Browse source 
* Fix file module check_mode
This commit is contained in:
Sloane Hertel 2018-06-29 14:19:34 -04:00 committed by Toshio Kuratomi
parent e9dbebfa57
commit 22a6927dbd
2 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
changelogs/fragments/file_touch_check_mode.yaml Normal file
View file

@ -0,0 +1,5 @@
---
bugfixes:
- file module - The touch subcommand had its diff output broken during the
2.6.x development cycle. The patch to fix that broke check mode.
This is now fixed (https://github.com/ansible/ansible/issues/42111)

7
lib/ansible/modules/files/file.py
View file

@ -322,6 +322,9 @@ def execute_touch(path, follow):
b_path = to_bytes(path, errors='surrogate_or_strict') b_path = to_bytes(path, errors='surrogate_or_strict')
prev_state = get_state(b_path) prev_state = get_state(b_path)
# Unfortunately, touch always changes the file because it updates file's timestamp
result = {'dest': path, 'changed': True}
if not module.check_mode: if not module.check_mode:
if prev_state == 'absent': if prev_state == 'absent':
# Create an empty file if the filename did not already exist # Create an empty file if the filename did not already exist
@ -369,8 +372,8 @@ def execute_touch(path, follow):
os.remove(b_path) os.remove(b_path)
raise raise
# Unfortunately, touch always changes the file because it updates file's timestamp result['diff'] = diff
return {'dest': path, 'changed': True, 'diff': diff} return result
def ensure_file_attributes(path, follow): def ensure_file_attributes(path, follow):