diff options
| author | Tristan Van Berkom <tristan.van.berkom@gmail.com> | 2019-01-12 22:02:55 +0000 |
|---|---|---|
| committer | Tristan Van Berkom <tristan.van.berkom@gmail.com> | 2019-01-12 22:02:55 +0000 |
| commit | 993e30ae75b2772d2cb9eb612fc0f7a3da969e8c (patch) | |
| tree | 02adcbf4a06f9d6f72b70942da82f99a39585c06 | |
| parent | d983f23137e0a1ec79ebff21e6c10868f1aab021 (diff) | |
| parent | 829a2b93c7926d5151a510ae8b005eec117143e6 (diff) | |
| download | buildstream-993e30ae75b2772d2cb9eb612fc0f7a3da969e8c.tar.gz | |
Merge branch 'tristan/fix-skipped-elements' into 'master'
_scheduler/queues/queue.py: Put elements in the skip list, not jobs
See merge request BuildStream/buildstream!1063
| -rw-r--r-- | buildstream/_scheduler/queues/queue.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/buildstream/_scheduler/queues/queue.py b/buildstream/_scheduler/queues/queue.py index 81760ace4..84416c8d2 100644 --- a/buildstream/_scheduler/queues/queue.py +++ b/buildstream/_scheduler/queues/queue.py @@ -170,9 +170,9 @@ class Queue(): skip = [job for job in jobs if self.status(job.element) == QueueStatus.SKIP] wait = [job for job in jobs if job not in skip] + self.skipped_elements.extend([job.element for job in skip]) self._wait_queue.extend(wait) self._done_queue.extend(skip) - self.skipped_elements.extend(skip) # dequeue() # |