diff options
| -rw-r--r-- | bitbake/lib/bb/runqueue.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/bitbake/lib/bb/runqueue.py b/bitbake/lib/bb/runqueue.py index bc2eb8772e..b90b7e7e4a 100644 --- a/bitbake/lib/bb/runqueue.py +++ b/bitbake/lib/bb/runqueue.py | |||
| @@ -466,7 +466,7 @@ class RunQueueData: | |||
| 466 | # (makes sure sometask runs after targetname's someothertask) | 466 | # (makes sure sometask runs after targetname's someothertask) |
| 467 | idepends = taskData.tasks_idepends[task] | 467 | idepends = taskData.tasks_idepends[task] |
| 468 | for (depid, idependtask) in idepends: | 468 | for (depid, idependtask) in idepends: |
| 469 | if depid in taskData.build_targets: | 469 | if depid in taskData.build_targets and not depid in taskData.failed_deps: |
| 470 | # Won't be in build_targets if ASSUME_PROVIDED | 470 | # Won't be in build_targets if ASSUME_PROVIDED |
| 471 | depdata = taskData.build_targets[depid][0] | 471 | depdata = taskData.build_targets[depid][0] |
| 472 | if depdata is not None: | 472 | if depdata is not None: |
| @@ -932,6 +932,8 @@ class RunQueue: | |||
| 932 | return self._execute_runqueue() | 932 | return self._execute_runqueue() |
| 933 | except bb.runqueue.TaskFailure: | 933 | except bb.runqueue.TaskFailure: |
| 934 | raise | 934 | raise |
| 935 | except SystemExit: | ||
| 936 | raise | ||
| 935 | except: | 937 | except: |
| 936 | logger.error("An uncaught exception occured in runqueue, please see the failure below:") | 938 | logger.error("An uncaught exception occured in runqueue, please see the failure below:") |
| 937 | self.state = runQueueComplete | 939 | self.state = runQueueComplete |
