FWGS/waf
2
0
Fork 0
mirror of https://gitlab.com/ita1024/waf.git synced 2024-11-25 19:30:04 +01:00
Code Issues Projects Releases Wiki Activity

Fix one regression on more_tasks #1981

Browse Source
This commit is contained in:
Thomas Nagy 2017-06-07 19:04:35 +02:00
parent 2871e1d016
commit f72167b0e0
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
waflib/Runner.py
View File

@ -213,8 +213,12 @@ class Parallel(object):
def insert_with_prio(self, tsk):
# TODO the deque interface has insert in python 3.5 :-/
if self.outstanding and tsk.prio >= self.outstanding[0].prio:
self.outstanding.appendleft(tsk)
if self.outstanding:
try:
if tsk.prio >= self.outstanding[0].prio:
self.outstanding.appendleft(tsk)
except AttributeError:
self.outstanding.appendleft(tsk)
else:
self.outstanding.append(tsk)
@ -230,7 +234,7 @@ class Parallel(object):
:type tsk: :py:attr:`waflib.Task.Task`
"""
if getattr(tsk, 'more_tasks', None):
ready, waiting = self.prio_and_split(tsk.tasks)
ready, waiting = self.prio_and_split(tsk.more_tasks)
for k in ready:
# TODO could be better, but we will have 1 task in general?
self.insert_with_prio(k)