mirror of https://gitlab.com/ita1024/waf.git
reverting the previous changes to runner.py, need to think more about it
This commit is contained in:
parent
e0bf42db95
commit
f5f73429d4
|
@ -234,20 +234,9 @@ class Parallel(object):
|
||||||
:param tsk: task
|
:param tsk: task
|
||||||
:type tsk: :py:attr:`waflib.Task.TaskBase`
|
:type tsk: :py:attr:`waflib.Task.TaskBase`
|
||||||
"""
|
"""
|
||||||
tsk.err_msg = Utils.ex_stack()
|
if not self.bld.keep:
|
||||||
if not self.stop and self.bld.keep:
|
self.stop = True
|
||||||
tsk.hasrun = Task.SKIPPED
|
self.error.append(tsk)
|
||||||
if self.bld.keep == 1:
|
|
||||||
# if -k stop at the first exception, if -kk try to go as far as possible
|
|
||||||
if Logs.verbose > 1 or not self.error:
|
|
||||||
self.error.append(tsk)
|
|
||||||
self.stop = True
|
|
||||||
else:
|
|
||||||
if Logs.verbose > 1:
|
|
||||||
self.error.append(tsk)
|
|
||||||
else:
|
|
||||||
tsk.hasrun = Task.EXCEPTION
|
|
||||||
self.error.append(tsk)
|
|
||||||
|
|
||||||
def add_task(self, tsk):
|
def add_task(self, tsk):
|
||||||
"""
|
"""
|
||||||
|
@ -324,6 +313,20 @@ class Parallel(object):
|
||||||
st = tsk.runnable_status()
|
st = tsk.runnable_status()
|
||||||
except Exception:
|
except Exception:
|
||||||
self.processed += 1
|
self.processed += 1
|
||||||
|
# TODO waf 1.7 this piece of code should go in the error_handler
|
||||||
|
tsk.err_msg = Utils.ex_stack()
|
||||||
|
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
|
||||||
|
if Logs.verbose > 1 or not self.error:
|
||||||
|
self.error.append(tsk)
|
||||||
|
self.stop = True
|
||||||
|
else:
|
||||||
|
if Logs.verbose > 1:
|
||||||
|
self.error.append(tsk)
|
||||||
|
continue
|
||||||
|
tsk.hasrun = Task.EXCEPTION
|
||||||
self.error_handler(tsk)
|
self.error_handler(tsk)
|
||||||
continue
|
continue
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue