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 290DC13888F for ; Tue, 13 Oct 2015 16:14:15 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5EA50E07F1; Tue, 13 Oct 2015 16:14:11 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 05DEFE07F1 for ; Tue, 13 Oct 2015 16:14:10 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D76CC33FAAE for ; Tue, 13 Oct 2015 16:14:08 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id EA3FE1059 for ; Tue, 13 Oct 2015 16:14:05 +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: <1444752739.ef7c3e4748bd497cc70bcb76e8b0cd217f3d0d4f.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/_emerge/ X-VCS-Repository: proj/portage X-VCS-Files: pym/_emerge/SpawnProcess.py X-VCS-Directories: pym/_emerge/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: ef7c3e4748bd497cc70bcb76e8b0cd217f3d0d4f X-VCS-Branch: master Date: Tue, 13 Oct 2015 16:14:05 +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: 7bbd255a-46d9-424b-a07e-ce1cf2888114 X-Archives-Hash: f43e7309b33afae2a3cc366857011ccc commit: ef7c3e4748bd497cc70bcb76e8b0cd217f3d0d4f Author: Zac Medico gentoo org> AuthorDate: Tue Oct 13 16:08:43 2015 +0000 Commit: Zac Medico gentoo org> CommitDate: Tue Oct 13 16:12:19 2015 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=ef7c3e47 SpawnProcess._set_returncode: handle missing cgroup IOError (bug 562964) Handle EnvironmentError, which includes the IOError that is raised when the cgroup has been removed by cgroup-release-agent. Fixes: e6be71af3f67 ("AbstractEbuildProcess: remove cgroup with release_agent (bug 561264)") X-Gentoo-bug: 562964 X-Gentoo-bug-url: https://bugs.gentoo.org/show_bug.cgi?id=562964 pym/_emerge/SpawnProcess.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pym/_emerge/SpawnProcess.py b/pym/_emerge/SpawnProcess.py index 15d3dc5..5ab2e67 100644 --- a/pym/_emerge/SpawnProcess.py +++ b/pym/_emerge/SpawnProcess.py @@ -185,8 +185,8 @@ class SpawnProcess(SubProcess): try: with open(os.path.join(cgroup, 'cgroup.procs'), 'r') as f: return [int(p) for p in f.read().split()] - except OSError: - # cgroup removed already? + except EnvironmentError: + # removed by cgroup-release-agent return [] def kill_all(pids, sig):