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 0abb5760259f538af0d8f03fe8909139f9e3b4de..0024f72c05e7146b5430588de9e4a760b2162580 100644 (file)
--- 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):