Fix merge problem.

diff --git a/src/src/queue.c b/src/src/queue.c
index ff0ae67e534e600dc1e0dba1faef5f84ae90c5ca..8876e09beb8ff233bea77e914fdf00a10853b99c 100644 (file)
--- a/src/src/queue.c
+++ b/src/src/queue.c
@@ -650,7 +650,7 @@ for (i  = (queue_run_in_order? -1 : 0);
     the mere fact that read() unblocks is enough. */
 
     set_process_info("running queue: waiting for children of %d", pid);
     the mere fact that read() unblocks is enough. */
 
     set_process_info("running queue: waiting for children of %d", pid);

-    if (read(pfd[pipe_read], buffer, sizeof(buffer)) >= 0)
+    if (read(pfd[pipe_read], buffer, sizeof(buffer)) > 0)

       log_write(0, LOG_MAIN|LOG_PANIC, "queue run: unexpected data on pipe");
     (void)close(pfd[pipe_read]);
     set_process_info("running queue");
       log_write(0, LOG_MAIN|LOG_PANIC, "queue run: unexpected data on pipe");
     (void)close(pfd[pipe_read]);
     set_process_info("running queue");