valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #27180 from tankywoo/file-copy-result-true-in-test

Browse Source 
file copy ret result True if no change in test mode
This commit is contained in:
Justin Findlay 2015-09-17 00:27:43 -06:00
commit d988aa2145
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
salt/states/file.py
View File

@ -3866,11 +3866,16 @@ def copy(
)
if __opts__['test']:
ret['comment'] = 'File "{0}" is set to be copied to "{1}"'.format(
source,
name
)
ret['result'] = None
if changed:
ret['comment'] = 'File "{0}" is set to be copied to "{1}"'.format(
source,
name
)
ret['result'] = None
else:
ret['comment'] = ('The target file "{0}" exists and will not be '
'overwritten'.format(name))
ret['result'] = True
return ret
if not changed: