ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-04-24 19:31:26 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

copy: Use the local file's mode for the argument if not explicitly given. (#17780)

Browse source 
* Use the local file's mode to for the argument if not explicitly given.

Fixes https://github.com/ansible/ansible-modules-core/issues/1124

* Fix octal mode for py3

* Implement preserve instead of null

* Remove duplicate line

* Update comment

* Use stat module per toshia's suggestion
This commit is contained in:
jctanner 2016-10-24 23:57:50 -04:00 • committed by GitHub
parent 1f30bc8a6f
commit 5502da3cf8
1 changed files with 13 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

13
lib/ansible/plugins/action/copy.py
View file

@ -21,6 +21,7 @@ __metaclass__ = type
import json import json
import os import os
import stat
import tempfile import tempfile
from ansible.errors import AnsibleError from ansible.errors import AnsibleError
@ -147,6 +148,9 @@ class ActionModule(ActionBase):
# expand any user home dir specifier # expand any user home dir specifier
dest = self._remote_expand_user(dest) dest = self._remote_expand_user(dest)
# Keep original value for mode parameter
mode_value = self._task.args.get('mode', None)
diffs = [] diffs = []
for source_full, source_rel in source_files: for source_full, source_rel in source_files:
@ -155,6 +159,12 @@ class ActionModule(ActionBase):
# Generate a hash of the local file. # Generate a hash of the local file.
local_checksum = checksum(source_full) local_checksum = checksum(source_full)
# Get the local mode and set if user wanted it preserved
# https://github.com/ansible/ansible-modules-core/issues/1124
if self._task.args.get('mode', None) == 'preserve':
lmode = '0%03o' % stat.S_IMODE(os.stat(source_full).st_mode)
self._task.args['mode'] = lmode
# If local_checksum is not defined we can't find the file so we should fail out. # If local_checksum is not defined we can't find the file so we should fail out.
if local_checksum is None: if local_checksum is None:
result['failed'] = True result['failed'] = True
@ -295,6 +305,9 @@ class ActionModule(ActionBase):
if 'path' in module_return and 'dest' not in module_return: if 'path' in module_return and 'dest' not in module_return:
module_return['dest'] = module_return['path'] module_return['dest'] = module_return['path']
# reset the mode
self._task.args['mode'] = mode_value
# Delete tmp path if we were recursive or if we did not execute a module. # Delete tmp path if we were recursive or if we did not execute a module.
if not delete_remote_tmp or (delete_remote_tmp and not module_executed): if not delete_remote_tmp or (delete_remote_tmp and not module_executed):
self._remove_tmp_path(tmp) self._remove_tmp_path(tmp)