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 PR #32732 to 2015.5 fixes #23714 (#32848)

Browse source
This commit is contained in:
lomeroe 2016-04-26 09:39:53 -05:00 • committed by Nicole Thomas
parent 9b5c14c37c
commit edce22a143
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

@ -3626,7 +3626,8 @@ def copy(
hash1 = salt.utils.get_hash(name)
hash2 = salt.utils.get_hash(source)
if hash1 == hash2:
changed = False
changed = True
ret['comment'] = ' '.join([ret['comment'], '- files are identical but force flag is set'])
if not force:
changed = False
elif not __opts__['test'] and changed: