From: Zac Medico <zmedico@gentoo.org>
Date: Mon, 20 Feb 2012 11:01:12 +0000 (-0800)
Subject: Scheduler: hang in _schedule_tasks, bug 404995
X-Git-Tag: v2.2.0_alpha88
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e465dbc4a726034a173407f3edfffc56e9ad8639;p=portage.git

Scheduler: hang in _schedule_tasks, bug 404995

This is triggered whenever emerge bails out while parallel-fetch is
running in the background.
---

diff --git a/pym/_emerge/Scheduler.py b/pym/_emerge/Scheduler.py
index b76d9ee96..62b3589d7 100644
--- a/pym/_emerge/Scheduler.py
+++ b/pym/_emerge/Scheduler.py
@@ -1523,8 +1523,9 @@ class Scheduler(PollScheduler):
 			if self._failed_pkgs and not self._build_opts.fetchonly and \
 				not self._is_work_scheduled() and \
 				self._task_queues.fetch:
+				# Since this happens asynchronously, it doesn't count in
+				# state_change (counting it triggers an infinite loop).
 				self._task_queues.fetch.clear()
-				state_change += 1
 
 			if not (state_change or \
 				(self._merge_wait_queue and not self._jobs and