From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1RzR3S-0008Vq-Ez for garchives@archives.gentoo.org; Mon, 20 Feb 2012 11:05:14 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EDCA2E084A; Mon, 20 Feb 2012 11:05:06 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id C1CDAE084A for ; Mon, 20 Feb 2012 11:05:06 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0A2FC67FB5 for ; Mon, 20 Feb 2012 11:05:06 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id C6CE2E53FF for ; Mon, 20 Feb 2012 11:05:04 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <1329735863.e465dbc4a726034a173407f3edfffc56e9ad8639.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/_emerge/ X-VCS-Repository: proj/portage X-VCS-Files: pym/_emerge/Scheduler.py X-VCS-Directories: pym/_emerge/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: e465dbc4a726034a173407f3edfffc56e9ad8639 X-VCS-Branch: master Date: Mon, 20 Feb 2012 11:05:04 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 384898b4-2837-40a5-bd12-c53101f28227 X-Archives-Hash: 81007d5c1db73da5ff5772834b4bc0e4 commit: e465dbc4a726034a173407f3edfffc56e9ad8639 Author: Zac Medico gentoo org> AuthorDate: Mon Feb 20 11:01:12 2012 +0000 Commit: Zac Medico gentoo org> CommitDate: Mon Feb 20 11:04:23 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3De465dbc4 Scheduler: hang in _schedule_tasks, bug 404995 This is triggered whenever emerge bails out while parallel-fetch is running in the background. --- pym/_emerge/Scheduler.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/pym/_emerge/Scheduler.py b/pym/_emerge/Scheduler.py index b76d9ee..62b3589 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 +=3D 1 =20 if not (state_change or \ (self._merge_wait_queue and not self._jobs and