From f53fda9fd6dfc68d8c70e3c273b02eac70d95f43 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Fri, 1 May 2015 23:14:38 +0200 Subject: [PATCH] Revert "core: treat ECHILD as child already terminated" This reverts commit 268da271cc2955400fa0068294a64a75e0422cee. This breaks the test, but it is not clear that this is the right fix. Revert for now, needs still investigation. --- src/NetworkManagerUtils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/NetworkManagerUtils.c b/src/NetworkManagerUtils.c index 25c419a79..ae2e83e48 100644 --- a/src/NetworkManagerUtils.c +++ b/src/NetworkManagerUtils.c @@ -566,7 +566,7 @@ nm_utils_kill_child_async (pid_t pid, int sig, guint64 log_domain, /* let's try again with waitpid, probably there was a race... */ ret = waitpid (pid, &status, 0); - if (ret > 0 || (ret < 0 && errno == ECHILD)) { + if (ret > 0) { nm_log_dbg (log_domain, LOG_NAME_FMT ": process %ld already terminated %s", LOG_NAME_ARGS, (long) ret, _kc_exit_to_string (buf_exit, status)); _kc_invoke_callback (pid, log_domain, log_name, callback, user_data, TRUE, status);