1 |
Handle EnvironmentError, which includes the IOError that is raised |
2 |
when the cgroup has been removed by cgroup-release-agent. |
3 |
|
4 |
Fixes: e6be71af3f67 ("AbstractEbuildProcess: remove cgroup with release_agent (bug 561264)") |
5 |
X-Gentoo-bug: 562964 |
6 |
X-Gentoo-bug-url: https://bugs.gentoo.org/show_bug.cgi?id=562964 |
7 |
--- |
8 |
pym/_emerge/SpawnProcess.py | 4 ++-- |
9 |
1 file changed, 2 insertions(+), 2 deletions(-) |
10 |
|
11 |
diff --git a/pym/_emerge/SpawnProcess.py b/pym/_emerge/SpawnProcess.py |
12 |
index 15d3dc5..5ab2e67 100644 |
13 |
--- a/pym/_emerge/SpawnProcess.py |
14 |
+++ b/pym/_emerge/SpawnProcess.py |
15 |
@@ -185,8 +185,8 @@ class SpawnProcess(SubProcess): |
16 |
try: |
17 |
with open(os.path.join(cgroup, 'cgroup.procs'), 'r') as f: |
18 |
return [int(p) for p in f.read().split()] |
19 |
- except OSError: |
20 |
- # cgroup removed already? |
21 |
+ except EnvironmentError: |
22 |
+ # removed by cgroup-release-agent |
23 |
return [] |
24 |
|
25 |
def kill_all(pids, sig): |
26 |
-- |
27 |
2.4.6 |