Merge pull request #4895 from boegel/fix_fake_module_environment

fix `fake_module_environment` context manager: make sure that cleanup of fake module is always done, even if an error was raised

Author: lexming

easybuild/framework/easyblock.py

@@ -2289,11 +2289,12 @@ def fake_module_environment(self, extra_modules=None, with_build_deps=False):
 
         fake_mod_data = self.load_fake_module(purge=True, extra_modules=extra_modules)
 
-        yield
-
-        # cleanup (unload fake module, remove fake module dir)
-        if fake_mod_data:
-            self.clean_up_fake_module(fake_mod_data)
+        try:
+            yield
+        finally:
+            # cleanup (unload fake module, remove fake module dir)
+            if fake_mod_data:
+                self.clean_up_fake_module(fake_mod_data)
 
     def guess_start_dir(self):
         """