From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 544A9138301 for ; Sun, 6 Jan 2013 08:44:58 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5BCBAE057F; Sun, 6 Jan 2013 08:44:50 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id DF59AE057F for ; Sun, 6 Jan 2013 08:44:49 +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 E541433DA41 for ; Sun, 6 Jan 2013 08:44:48 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 5CFA9E5439 for ; Sun, 6 Jan 2013 08:44:47 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <1357461852.8b573eaae39ca805d29d527bbea96e97060d204a.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/_emerge/ X-VCS-Repository: proj/portage X-VCS-Files: pym/_emerge/MetadataRegen.py X-VCS-Directories: pym/_emerge/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 8b573eaae39ca805d29d527bbea96e97060d204a X-VCS-Branch: master Date: Sun, 6 Jan 2013 08:44:47 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 03a20007-3189-4ece-9e8d-33fe9ae53c47 X-Archives-Hash: 2bc6d518c4bc4058109acd021c624539 commit: 8b573eaae39ca805d29d527bbea96e97060d204a Author: Zac Medico gentoo org> AuthorDate: Sun Jan 6 08:44:12 2013 +0000 Commit: Zac Medico gentoo org> CommitDate: Sun Jan 6 08:44:12 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=8b573eaa MetadataRegen: fix signal interrupt handling We have to force it out of the scheduling loop before _termination_check can have an effect. --- pym/_emerge/MetadataRegen.py | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pym/_emerge/MetadataRegen.py b/pym/_emerge/MetadataRegen.py index 80dbb5a..6203c78 100644 --- a/pym/_emerge/MetadataRegen.py +++ b/pym/_emerge/MetadataRegen.py @@ -1,4 +1,4 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 import portage @@ -50,7 +50,7 @@ class MetadataRegen(AsyncScheduler): consumer = self._consumer for cp in self._cp_iter: - if self._terminated_tasks: + if self._terminated.is_set(): break cp_set.add(cp) portage.writemsg_stdout("Processing %s\n" % cp) @@ -60,7 +60,7 @@ class MetadataRegen(AsyncScheduler): repo = portdb.repositories.get_repo_for_location(mytree) cpv_list = portdb.cp_list(cp, mytree=[repo.location]) for cpv in cpv_list: - if self._terminated_tasks: + if self._terminated.is_set(): break valid_pkgs.add(cpv) ebuild_path, repo_path = portdb.findname2(cpv, myrepo=repo.name) @@ -86,6 +86,7 @@ class MetadataRegen(AsyncScheduler): portdb = self._portdb dead_nodes = {} + self._termination_check() if self._terminated_tasks: self.returncode = self._cancelled_returncode return self.returncode