From 6864b9525da3eda1b4986ca31098e7a0fa1ab369 Mon Sep 17 00:00:00 2001
From: Martin Diehl <mail@martin-diehl.net>
Date: Sun, 26 Apr 2020 14:52:27 +0200
Subject: [PATCH] go back to original dir as soon as possible

---
 python/damask/util.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/python/damask/util.py b/python/damask/util.py
index d45ea366e..cb1d8757d 100644
--- a/python/damask/util.py
+++ b/python/damask/util.py
@@ -112,8 +112,8 @@ def execute(cmd,
 
     """
     initialPath = os.getcwd()
-    os.chdir(wd)
     myEnv = os.environ if env is None else env
+    os.chdir(wd)
     process = subprocess.Popen(shlex.split(cmd),
                                stdout = subprocess.PIPE,
                                stderr = subprocess.PIPE,
@@ -121,9 +121,9 @@ def execute(cmd,
                                env = myEnv)
     out,error = [i for i in (process.communicate() if streamIn is None
                                                    else process.communicate(streamIn.read().encode('utf-8')))]
+    os.chdir(initialPath)
     out   = out.decode('utf-8').replace('\x08','')
     error = error.decode('utf-8').replace('\x08','')
-    os.chdir(initialPath)
     if process.returncode != 0:
         raise RuntimeError('{} failed with returncode {}'.format(cmd,process.returncode))
     return out,error