mirror of
https://github.com/ansible-collections/community.general.git
synced 2024-09-14 20:13:21 +02:00
Reset the current directory after running subprocess.Popen
This commit is contained in:
parent
69ff355726
commit
a348f67238
1 changed files with 13 additions and 4 deletions
|
@ -1074,12 +1074,17 @@ class AnsibleModule(object):
|
|||
if cwd and os.path.isdir(cwd):
|
||||
kwargs['cwd'] = cwd
|
||||
|
||||
# store the pwd
|
||||
prev_dir = os.getcwd()
|
||||
|
||||
# make sure we're in the right working directory
|
||||
if cwd and os.path.isdir(cwd):
|
||||
try:
|
||||
os.chdir(cwd)
|
||||
except (OSError, IOError), e:
|
||||
self.fail_json(rc=e.errno, msg="Could not open %s , %s" % (cwd, str(e)))
|
||||
|
||||
try:
|
||||
# make sure we're in the right working directory
|
||||
if cwd and os.path.isdir(cwd):
|
||||
os.chdir(cwd)
|
||||
|
||||
cmd = subprocess.Popen(args, **kwargs)
|
||||
|
||||
if data:
|
||||
|
@ -1094,6 +1099,10 @@ class AnsibleModule(object):
|
|||
if rc != 0 and check_rc:
|
||||
msg = err.rstrip()
|
||||
self.fail_json(cmd=clean_args, rc=rc, stdout=out, stderr=err, msg=msg)
|
||||
|
||||
# reset the pwd
|
||||
os.chdir(prev_dir)
|
||||
|
||||
return (rc, out, err)
|
||||
|
||||
def append_to_file(self, filename, str):
|
||||
|
|
Loading…
Reference in a new issue