public inbox for gentoo-portage-dev@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-portage-dev] [PATCH] SpawnProcess._set_returncode: handle missing cgroup IOError (bug 562964)
@ 2015-10-13 16:10 Zac Medico
  2015-10-13 16:14 ` [gentoo-portage-dev] " Zac Medico
  0 siblings, 1 reply; 2+ messages in thread
From: Zac Medico @ 2015-10-13 16:10 UTC (permalink / raw
  To: gentoo-portage-dev; +Cc: Zac Medico

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):
-- 
2.4.6



^ permalink raw reply related	[flat|nested] 2+ messages in thread

* [gentoo-portage-dev] Re: [PATCH] SpawnProcess._set_returncode: handle missing cgroup IOError (bug 562964)
  2015-10-13 16:10 [gentoo-portage-dev] [PATCH] SpawnProcess._set_returncode: handle missing cgroup IOError (bug 562964) Zac Medico
@ 2015-10-13 16:14 ` Zac Medico
  0 siblings, 0 replies; 2+ messages in thread
From: Zac Medico @ 2015-10-13 16:14 UTC (permalink / raw
  To: gentoo-portage-dev

On 10/13/2015 09:10 AM, Zac Medico wrote:
> 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

I've pushed this because it's a trivial bug fix.
-- 
Thanks,
Zac


^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2015-10-13 16:14 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-10-13 16:10 [gentoo-portage-dev] [PATCH] SpawnProcess._set_returncode: handle missing cgroup IOError (bug 562964) Zac Medico
2015-10-13 16:14 ` [gentoo-portage-dev] " Zac Medico

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox