summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--pym/_emerge/Scheduler.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/pym/_emerge/Scheduler.py b/pym/_emerge/Scheduler.py
index c6161201a..6c2460455 100644
--- a/pym/_emerge/Scheduler.py
+++ b/pym/_emerge/Scheduler.py
@@ -301,7 +301,10 @@ class Scheduler(PollScheduler):
for build in self._task_queues.jobs._task_queue:
self._running_tasks.remove(build.pkg)
for merge in self._task_queues.merge._task_queue:
- self._running_tasks.remove(merge.merge.pkg)
+ # Setup phases may be scheduled in this queue, but
+ # we're only interested in the PackageMerge instances.
+ if isinstance(merge, PackageMerge):
+ self._running_tasks.remove(merge.merge.pkg)
for q in self._task_queues.values():
q.clear()