config: fix wait for backup completeness

tvheadend · Jun 20, 2015 · 8d561f1 · 8d561f1
1 parent 51d4476
commit 8d561f1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/src/config.c b/src/config.c
@@ -1338,6 +1338,7 @@ dobackup(const char *oldver)
       usleep(20000);
     if (code == -ECHILD)
       code = 0;
+    tvhinfo("config", "backup: completed");
   }
 
   if (code) {

diff --git a/src/spawn.c b/src/spawn.c
@@ -241,8 +241,11 @@ spawn_reap(pid_t wpid, char *stxt, size_t stxtlen)
     return -EAGAIN;
   if(pid < 0)
     return -errno;
-  if(pid < 1)
+  if(pid < 1) {
+    if (wpid > 0 && pid != wpid)
+      return -EAGAIN;
     return 0;
+  }
 
   pthread_mutex_lock(&spawn_mutex);
   LIST_FOREACH(s, &spawns, link)