Fixes #197 don't remove sandbox dir if an exception happens

1 files changed, 12 insertions, 3 deletions

diff --git a/ybd/sandbox.py b/ybd/sandbox.py
index 989b69a..44ef76f 100644
--- a/ybd/sandbox.py
+++ b/ybd/sandbox.py
@@ -58,10 +58,19 @@ def setup(this):
 
     try:
         yield
+    except app.RetryException as e:
+        raise e
+    except:
+        import traceback
+        app.log(this, 'ERROR: a surprise exception happened', '')
+        traceback.print_exc()
+        app.exit(this, 'ERROR: sandbox debris is at', this['sandbox'])
     finally:
-        if app.config.get('log-verbose'):
-            app.log(this, "Removing sandbox dir", this['sandbox'])
-        app.remove_dir(this['sandbox'])
+        pass
+
+    if app.config.get('log-verbose'):
+        app.log(this, "Removing sandbox dir", this['sandbox'])
+    app.remove_dir(this['sandbox'])
 
 
 def install(defs, this, component):