FIX: Revert directory when exception raised

Author: effigies

nipype/utils/filemanip.py

@@ -923,5 +923,7 @@ def relpath(path, start=None):
 def indirectory(path):
     cwd = os.getcwd()
     os.chdir(path)
-    yield
-    os.chdir(cwd)
+    try:
+        yield
+    finally:
+        os.chdir(cwd)

nipype/utils/tests/test_filemanip.py

@@ -515,3 +515,9 @@ def test_indirectory(tmpdir):
             assert os.getcwd() == sd2
         assert os.getcwd() == sd1
     assert os.getcwd() == tmpdir.strpath
+    try:
+        with indirectory('subdir1'):
+            raise ValueError("Erroring out of context")
+    except ValueError:
+        pass
+    assert os.getcwd() == tmpdir.strpath