From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 10 Aug 2014 19:42:58 +0000 (+0100)
Subject: When killing build subprocess during failure of rpush, try reaping it (so we can... 
X-Git-Tag: debian/0.22~7
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=8c229ab1d6afbf7008d3be50d5c33fa7a3dc88ab;hp=f0e2a4873a21f9b0399686aad295938891dc5417

When killing build subprocess during failure of rpush, try reaping it (so we can report it) before killing it.
---

diff --git a/dgit b/dgit
index 59fabafb..40953871 100755
--- a/dgit
+++ b/dgit
@@ -1750,12 +1750,14 @@ sub cmd_remote_push_responder {
 }
 
 our $i_tmp;
-our $i_child_pid;
 
 sub i_cleanup {
-    local ($@);
-    if ($i_child_pid) {
-	printdebug "(killing remote child $i_child_pid)\n";
+    local ($@, $?);
+    my $report = i_child_report();
+    if (defined $report) {
+	printdebug "($report)\n";
+    } elsif ($i_child_pid) {
+	printdebug "(killing build host child $i_child_pid)\n";
 	kill 15, $i_child_pid;
     }
     if (defined $i_tmp && !defined $initiator_tempdir) {