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

Merge pull request #23957 from rallytime/bp-23951

Browse source 
Backport #23951 to 2015.5
This commit is contained in:
Justin Findlay 2015-05-19 21:04:24 -06:00
commit 2d185f78f7
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
salt/states/file.py
View file

@ -3643,7 +3643,11 @@ def copy(
try:
shutil.copy(source, name)
ret['changes'] = {name: source}
__salt__['file.check_perms'](name, ret, user, group, mode)
# Preserve really means just keep the behavior of the cp command. If
# the filesystem we're copying to is squashed or doesn't support chown
# then we shouldn't be checking anything.
if not preserve:
__salt__['file.check_perms'](name, ret, user, group, mode)
except (IOError, OSError):
return _error(
ret, 'Failed to copy "{0}" to "{1}"'.format(source, name))