ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-06-18 22:31:06 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Merge branch 'retf_py' of git://github.com/berendt/ansible into devel

Browse source 
Conflicts:
	lib/ansible/inventory/vars_plugins/group_vars.py
	plugins/callbacks/mail.py
This commit is contained in:
Michael DeHaan 2014-08-08 12:17:37 -04:00
commit 8c4161d4a1
21 changed files with 48 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/ansible/runner/action_plugins/script.py
View file

@ -112,7 +112,7 @@ class ActionModule(object):
conn.put_file(source, tmp_src)
sudoable = True
# set file permissions, more permisive when the copy is done as a different user
# set file permissions, more permissive when the copy is done as a different user
if ((self.runner.sudo and self.runner.sudo_user != 'root') or
(self.runner.su and self.runner.su_user != 'root')):
chmod_mode = 'a+rx'