Rename SubProcess._zombie() to _orphan_process_warn() and clarify
authorZac Medico <zmedico@gentoo.org>
Fri, 13 Aug 2010 17:53:59 +0000 (10:53 -0700)
committerZac Medico <zmedico@gentoo.org>
Fri, 13 Aug 2010 17:53:59 +0000 (10:53 -0700)
the eerror message.

pym/_emerge/AbstractEbuildProcess.py
pym/_emerge/SubProcess.py

index 991e2499d2bbca001125cdc387bc8eea98b66fc2..57f4c8f87d762b1e76f644826be49b4e5cd8ee35 100644 (file)
@@ -66,12 +66,12 @@ class AbstractEbuildProcess(SpawnProcess):
                                # being killed by a signal.
                                self.cancel()
 
-       def _zombie(self):
+       def _orphan_process_warn(self):
                phase = self._get_phase()
 
-               msg = _("The ebuild phase '%s' appears "
-               "to have left a zombie process with "
-               "pid %d.") % (phase, self.pid)
+               msg = _("The ebuild phase '%s' with pid %s appears "
+               "to have left an orphan process running in the "
+               "background.") % (phase, self.pid)
 
                self._eerror(textwrap.wrap(msg, 72))
 
index b6489c3932a2febeb674ff8e59079dc1b4c6739e..9d75f0ea1213737351ca7737fb3f1c16f89890de 100644 (file)
@@ -73,7 +73,7 @@ class SubProcess(AbstractPollTask):
                                                del e
                                        self.scheduler.schedule(self._reg_id, timeout=timeout)
                                        if self._registered:
-                                               self._zombie()
+                                               self._orphan_process_warn()
                        else:
                                self.scheduler.schedule(self._reg_id)
                        self._unregister()
@@ -92,7 +92,7 @@ class SubProcess(AbstractPollTask):
 
                return self.returncode
 
-       def _zombie(self):
+       def _orphan_process_warn(self):
                pass
 
        def _unregister(self):