From: Zac Medico <zmedico@gentoo.org>
Date: Sat, 1 Dec 2007 21:23:40 +0000 (-0000)
Subject: When os.waitid() raises OSError, discard the pid since there's
X-Git-Tag: v2.2_pre1~251
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=2c095c3fb3325b13a42776322b829ef8d6f216c6;p=portage.git

When os.waitid() raises OSError, discard the pid since there's
no need to wait on it again.

svn path=/main/trunk/; revision=8792
---

diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index 0abb57602..0024f72c0 100644
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -4085,8 +4085,9 @@ class MergeTask(object):
 				if os.waitpid(pid, os.WNOHANG) == (0, 0):
 					continue
 			except OSError:
-				# This pid has been cleaned up elsewhere.
-				continue
+				# This pid has been cleaned up elsewhere,
+				# so remove it from our list.
+				pass
 			spawned_pids.remove(pid)
 
 	def _merge(self, mylist, favorites, mtimedb):