#1008

[tridge/waf-svn.git/.git] / waflib / Runner.py

diff --git a/waflib/Runner.py b/waflib/Runner.py
index 076670d4301595d1d9ad1e7e51ed10aae95cd78a..29b77756dc843b51429e5041279cc871c41226a1 100644 (file)
--- a/waflib/Runner.py
+++ b/waflib/Runner.py
@@ -309,8 +309,11 @@ class Parallel(object):
                                st = tsk.runnable_status()
                        except Exception:
                                self.processed += 1
-                               if self.stop and not self.bld.keep:
+                               if not self.stop and self.bld.keep:
                                        tsk.hasrun = Task.SKIPPED
+                                       if self.bld.keep == 1:
+                                               # if -k stop at the first exception, if -kk try to go as far as possible
+                                               self.stop = True
                                        continue
                                tsk.err_msg = Utils.ex_stack()
                                tsk.hasrun = Task.EXCEPTION