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 #15466 from cimarronm/correct_test_result_states.file.prepend

Browse Source 
Bugfix for result returned from states.file.prepend with test option
This commit is contained in:
Thomas S Hatch 2014-09-03 09:01:42 -06:00
commit d5602028ce
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
salt/states/file.py
View File

@ -3145,7 +3145,6 @@ def prepend(name,
if __opts__['test']:
nlines = test_lines + slines
ret['result'] = None
if slines != nlines:
if not salt.utils.istextfile(name):
ret['changes']['diff'] = 'Replace binary file'
@ -3154,8 +3153,10 @@ def prepend(name,
ret['changes']['diff'] = (
''.join(difflib.unified_diff(slines, nlines))
)
ret['result'] = None
else:
ret['comment'] = 'File {0} is in correct state'.format(name)
ret['result'] = True
return ret
__salt__['file.prepend'](name, *preface)