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

cleanp net_put temp file (#48148)

Browse source
This commit is contained in:
Deepak Agrawal 2018-11-06 12:02:01 +05:30 committed by GitHub
parent 8a9d7b3695
commit d2c7665be9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/ansible/plugins/action/net_put.py
View file

@ -23,6 +23,7 @@ import time
import uuid import uuid
import hashlib import hashlib
import sys import sys
import re
from ansible.module_utils._text import to_text, to_bytes from ansible.module_utils._text import to_text, to_bytes
from ansible.module_utils.connection import Connection from ansible.module_utils.connection import Connection
@ -148,7 +149,11 @@ class ActionModule(ActionBase):
proto=proto, timeout=timeout proto=proto, timeout=timeout
) )
except Exception as exc: except Exception as exc:
if (to_text(exc)).find("No such file or directory") > 0: pattern = to_text(exc)
not_found_exc = "No such file or directory"
if re.search(not_found_exc, pattern, re.I):
if os.path.exists(source_file):
os.remove(source_file)
return True return True
else: else:
try: try:
@ -162,6 +167,7 @@ class ActionModule(ActionBase):
with open(source_file, 'r') as f: with open(source_file, 'r') as f:
old_content = f.read() old_content = f.read()
except (IOError, OSError) as ioexc: except (IOError, OSError) as ioexc:
os.remove(source_file)
raise IOError(ioexc) raise IOError(ioexc)
sha1 = hashlib.sha1() sha1 = hashlib.sha1()