diff options
| author | Zac Medico <zmedico@gentoo.org> | 2010-08-13 10:53:59 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2010-08-13 10:53:59 -0700 |
| commit | 26744c1e52a05f7bdc9a14926eb15d7cd08cd354 (patch) | |
| tree | cb702718981d3a76f096fc35e6708ee658dc6c64 | |
| parent | c192ad9dcd9e70e206340caa0a4bbd70fd0582bf (diff) | |
| download | portage-26744c1e52a05f7bdc9a14926eb15d7cd08cd354.tar.gz portage-26744c1e52a05f7bdc9a14926eb15d7cd08cd354.tar.bz2 portage-26744c1e52a05f7bdc9a14926eb15d7cd08cd354.zip | |
Rename SubProcess._zombie() to _orphan_process_warn() and clarify
the eerror message.
| -rw-r--r-- | pym/_emerge/AbstractEbuildProcess.py | 8 | ||||
| -rw-r--r-- | pym/_emerge/SubProcess.py | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/pym/_emerge/AbstractEbuildProcess.py b/pym/_emerge/AbstractEbuildProcess.py index 991e2499d..57f4c8f87 100644 --- a/pym/_emerge/AbstractEbuildProcess.py +++ b/pym/_emerge/AbstractEbuildProcess.py @@ -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)) diff --git a/pym/_emerge/SubProcess.py b/pym/_emerge/SubProcess.py index b6489c393..9d75f0ea1 100644 --- a/pym/_emerge/SubProcess.py +++ b/pym/_emerge/SubProcess.py @@ -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): |