summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--bitbake/lib/bb/runqueue.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/bitbake/lib/bb/runqueue.py b/bitbake/lib/bb/runqueue.py
index 1a19677892..6372b65fd9 100644
--- a/bitbake/lib/bb/runqueue.py
+++ b/bitbake/lib/bb/runqueue.py
@@ -1779,6 +1779,7 @@ class RunQueueExecuteScenequeue(RunQueueExecute):
1779 if len(self.sq_revdeps[task]) == 0: 1779 if len(self.sq_revdeps[task]) == 0:
1780 self.runq_buildable[task] = 1 1780 self.runq_buildable[task] = 1
1781 1781
1782 self.outrightfail = []
1782 if self.rq.hashvalidate: 1783 if self.rq.hashvalidate:
1783 sq_hash = [] 1784 sq_hash = []
1784 sq_hashfn = [] 1785 sq_hashfn = []
@@ -1829,7 +1830,7 @@ class RunQueueExecuteScenequeue(RunQueueExecute):
1829 realtask = self.rqdata.runq_setscene[task] 1830 realtask = self.rqdata.runq_setscene[task]
1830 logger.debug(2, 'No package found, so skipping setscene task %s', 1831 logger.debug(2, 'No package found, so skipping setscene task %s',
1831 self.rqdata.get_user_idstring(realtask)) 1832 self.rqdata.get_user_idstring(realtask))
1832 self.task_failoutright(task) 1833 self.outrightfail.append(task)
1833 1834
1834 logger.info('Executing SetScene Tasks') 1835 logger.info('Executing SetScene Tasks')
1835 1836
@@ -1914,6 +1915,9 @@ class RunQueueExecuteScenequeue(RunQueueExecute):
1914 self.task_skip(nexttask) 1915 self.task_skip(nexttask)
1915 self.scenequeue_notneeded.add(nexttask) 1916 self.scenequeue_notneeded.add(nexttask)
1916 return True 1917 return True
1918 if nexttask in self.outrightfail:
1919 self.task_failoutright(nexttask)
1920 return True
1917 task = nexttask 1921 task = nexttask
1918 break 1922 break
1919 if task is not None: 1923 if task is not None: