summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2007-12-01 21:23:40 +0000
committerZac Medico <zmedico@gentoo.org>2007-12-01 21:23:40 +0000
commit2c095c3fb3325b13a42776322b829ef8d6f216c6 (patch)
tree3a31e5e0c2947c709811f77b18ca8565bdbec77b
parent92ac7ae466c5aaa520b45635739bb8df29feef2b (diff)
downloadportage-2c095c3fb3325b13a42776322b829ef8d6f216c6.tar.gz
portage-2c095c3fb3325b13a42776322b829ef8d6f216c6.tar.bz2
portage-2c095c3fb3325b13a42776322b829ef8d6f216c6.zip
When os.waitid() raises OSError, discard the pid since there's
no need to wait on it again. svn path=/main/trunk/; revision=8792
-rw-r--r--pym/_emerge/__init__.py5
1 files changed, 3 insertions, 2 deletions
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):