| 1 |
commit: 3e235049eb36dd983b695ed50aca4e32d7d28950 |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Apr 29 00:48:41 2018 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Apr 29 00:48:41 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=3e235049 |
| 7 |
|
| 8 |
AbstractEbuildProcess: use _async_waitpid after kill (bug 403697) |
| 9 |
|
| 10 |
Use _async_waitpid() instead of _async_wait() in the _cancel_timeout_cb |
| 11 |
method, since the pid exit status may not be available yet. |
| 12 |
|
| 13 |
Bug: https://bugs.gentoo.org/403697 |
| 14 |
|
| 15 |
pym/_emerge/AbstractEbuildProcess.py | 2 +- |
| 16 |
1 file changed, 1 insertion(+), 1 deletion(-) |
| 17 |
|
| 18 |
diff --git a/pym/_emerge/AbstractEbuildProcess.py b/pym/_emerge/AbstractEbuildProcess.py |
| 19 |
index d481e6046..1012ce166 100644 |
| 20 |
--- a/pym/_emerge/AbstractEbuildProcess.py |
| 21 |
+++ b/pym/_emerge/AbstractEbuildProcess.py |
| 22 |
@@ -266,7 +266,7 @@ class AbstractEbuildProcess(SpawnProcess): |
| 23 |
|
| 24 |
def _cancel_timeout_cb(self): |
| 25 |
self._exit_timeout_id = None |
| 26 |
- self._async_wait() |
| 27 |
+ self._async_waitpid() |
| 28 |
return False # only run once |
| 29 |
|
| 30 |
def _orphan_process_warn(self): |
Archives