# HG changeset patch
# User osimons
# Date 1273834282 0
# Node ID 7eaece84fe85a60b5afa965c60415df74217aaad
# Parent  23c551403e8b3c41c7e553f136f34798962d16bb
Merged [874] from trunk.

diff --git a/bitten/slave.py b/bitten/slave.py
--- a/bitten/slave.py
+++ b/bitten/slave.py
@@ -355,9 +355,10 @@
         build_id = build_url and int(build_url.split('/')[-1]) or 0
         xml = xmlio.parse(fileobj)
         basedir = ''
-        keepalive_thread = KeepAliveThread(self.opener, build_url, self.single_build, self.keepalive_interval)
         try:
             if not self.local:
+                keepalive_thread = KeepAliveThread(self.opener, build_url,
+                                    self.single_build, self.keepalive_interval)
                 keepalive_thread.start()
             recipe = Recipe(xml, os.path.join(self.work_dir, self.build_dir), 
                             self.config)
@@ -380,7 +381,8 @@
             if self.dry_run:
                 self._cancel_build(build_url)
         finally:
-            keepalive_thread.stop()
+            if not self.local:
+                keepalive_thread.stop()
             if not self.keep_files and os.path.isdir(basedir):
                 log.debug('Removing build directory %s' % basedir)
                 _rmtree(basedir)