cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Avoid crash in module_common when the file cannot be moved/copy

Browse source
This commit is contained in:
Kavin Kankeshwar 2013-05-29 00:03:12 -07:00
parent dbfad567bc
commit 8217e0706f
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/ansible/module_common.py
View file

@ -815,7 +815,7 @@ class AnsibleModule(object):
self.fail_json(msg='Could not make backup of %s to %s: %s' % (fn, backupdest, e))
return backupdest
def cleanup(tmpfile):
def cleanup(self,tmpfile):
if os.path.exists(tmpfile):
try:
os.unlink(tmpfile)
@ -856,7 +856,7 @@ class AnsibleModule(object):
# rename might not preserve context
self.set_context_if_different(dest, context, False)
except (shutil.Error, OSError, IOError), e:
cleanup(tmp_dest)
self.cleanup(tmp_dest)
self.fail_json(msg='Could not replace file: %s to %s: %s' % (src, dest, e))
def run_command(self, args, check_rc=False, close_fds=False, executable=None, data=None):