commit: ef7c3e4748bd497cc70bcb76e8b0cd217f3d0d4f
Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 13 16:08:43 2015 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> 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):
