# HG changeset patch
# User osimons
# Date 1246979429 0
# Node ID 4b75e3f6f27cfbe809cd42f6b997a2548c0b2885
# Parent  9ae8f6a95d4b4ddddcdee437ca1c106589a475d9
0.6dev: Fixing #229 again - keeping `slave.work_dir` if either `--keep_files` or `--work_dir=` are part of  options.

diff --git a/bitten/slave.py b/bitten/slave.py
--- a/bitten/slave.py
+++ b/bitten/slave.py
@@ -430,8 +430,8 @@
     except ExitSlave, e:
         exit_code = e.exit_code
 
-    if not options.keep_files:
-        log.debug('Removing temporary directory %s' % slave.work_dir)
+    if not (options.work_dir or options.keep_files):
+        log.debug('Removing working directory %s' % slave.work_dir)
         _rmtree(slave.work_dir)
     return exit_code