saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Backport of PR #36589 / Issue #36588 to 2016.3 branch.

Browse source
This commit is contained in:
Steve Linn 2016-09-27 08:43:21 -07:00
parent 25fa754d94
commit d9da5cb2d4
1 changed files with 16 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
salt/states/file.py
View file

@ -1627,24 +1627,6 @@ def managed(name,
if not context:
context = {}
context['accumulator'] = accum_data[name]
if 'file.check_managed_changes' in __salt__:
ret['pchanges'] = __salt__['file.check_managed_changes'](
name,
source,
source_hash,
user,
group,
mode,
template,
context,
defaults,
__env__,
contents,
skip_verify,
**kwargs
)
else:
ret['pchanges'] = {}
if show_diff is not None:
show_changes = show_diff
@ -1656,6 +1638,22 @@ def managed(name,
try:
if __opts__['test']:
if 'file.check_managed_changes' in __salt__:
ret['pchanges'] = __salt__['file.check_managed_changes'](
name,
source,
source_hash,
user,
group,
mode,
template,
context,
defaults,
__env__,
contents,
skip_verify,
**kwargs
)
if ret['pchanges']:
ret['result'] = None
ret['comment'] = 'The file {0} is set to be changed'.format(name)