ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-07-28 23:51:23 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Merge pull request #14477 from pgrange/devel

Browse source 
Fix related to  #13981
This commit is contained in:
Brian Coca 2016-02-15 09:10:59 -05:00
commit f6d2767ce9
1 changed files with 31 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

62
lib/ansible/module_utils/basic.py
View file

@ -1758,39 +1758,39 @@ class AnsibleModule(object):
# only try workarounds for errno 18 (cross device), 1 (not permitted), 13 (permission denied) # only try workarounds for errno 18 (cross device), 1 (not permitted), 13 (permission denied)
# and 26 (text file busy) which happens on vagrant synced folders and other 'exotic' non posix file systems # and 26 (text file busy) which happens on vagrant synced folders and other 'exotic' non posix file systems
self.fail_json(msg='Could not replace file: %s to %s: %s' % (src, dest, e)) self.fail_json(msg='Could not replace file: %s to %s: %s' % (src, dest, e))
else:
dest_dir = os.path.dirname(dest) dest_dir = os.path.dirname(dest)
dest_file = os.path.basename(dest) dest_file = os.path.basename(dest)
try:
tmp_dest = tempfile.NamedTemporaryFile(
prefix=".ansible_tmp", dir=dest_dir, suffix=dest_file)
except (OSError, IOError):
e = get_exception()
self.fail_json(msg='The destination directory (%s) is not writable by the current user.' % dest_dir)
try: # leaves tmp file behind when sudo and not root
if switched_user and os.getuid() != 0:
# cleanup will happen by 'rm' of tempdir
# copy2 will preserve some metadata
shutil.copy2(src, tmp_dest.name)
else:
shutil.move(src, tmp_dest.name)
if self.selinux_enabled():
self.set_context_if_different(
tmp_dest.name, context, False)
try: try:
tmp_stat = os.stat(tmp_dest.name) tmp_dest = tempfile.NamedTemporaryFile(
if dest_stat and (tmp_stat.st_uid != dest_stat.st_uid or tmp_stat.st_gid != dest_stat.st_gid): prefix=".ansible_tmp", dir=dest_dir, suffix=dest_file)
os.chown(tmp_dest.name, dest_stat.st_uid, dest_stat.st_gid) except (OSError, IOError):
except OSError:
e = get_exception() e = get_exception()
if e.errno != errno.EPERM: self.fail_json(msg='The destination directory (%s) is not writable by the current user.' % dest_dir)
raise
os.rename(tmp_dest.name, dest) try: # leaves tmp file behind when sudo and not root
except (shutil.Error, OSError, IOError): if switched_user and os.getuid() != 0:
e = get_exception() # cleanup will happen by 'rm' of tempdir
self.cleanup(tmp_dest.name) # copy2 will preserve some metadata
self.fail_json(msg='Could not replace file: %s to %s: %s' % (src, dest, e)) shutil.copy2(src, tmp_dest.name)
else:
shutil.move(src, tmp_dest.name)
if self.selinux_enabled():
self.set_context_if_different(
tmp_dest.name, context, False)
try:
tmp_stat = os.stat(tmp_dest.name)
if dest_stat and (tmp_stat.st_uid != dest_stat.st_uid or tmp_stat.st_gid != dest_stat.st_gid):
os.chown(tmp_dest.name, dest_stat.st_uid, dest_stat.st_gid)
except OSError:
e = get_exception()
if e.errno != errno.EPERM:
raise
os.rename(tmp_dest.name, dest)
except (shutil.Error, OSError, IOError):
e = get_exception()
self.cleanup(tmp_dest.name)
self.fail_json(msg='Could not replace file: %s to %s: %s' % (src, dest, e))
if creating: if creating:
# make sure the file has the correct permissions # make sure the file has the correct permissions