From 3fad6db8d44a435d456e9d79e2c6811ac2bc0364 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Wed, 11 Jan 2017 23:15:11 +0000
Subject: Dgit: forkcheck_*: break out from setup_sigwarn

Other places are going to want this too, notably END blocks.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---
 Debian/Dgit.pm | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/Debian/Dgit.pm b/Debian/Dgit.pm
index be8cbee..5e0bbd5 100644
--- a/Debian/Dgit.pm
+++ b/Debian/Dgit.pm
@@ -36,7 +36,7 @@ BEGIN {
 
     $VERSION     = 1.00;
     @ISA         = qw(Exporter);
-    @EXPORT      = qw(setup_sigwarn
+    @EXPORT      = qw(setup_sigwarn forkcheck_setup forkcheck_mainprocess
 		      dep14_version_mangle
                       debiantags debiantag_old debiantag_new
 		      server_branch server_ref
@@ -81,10 +81,21 @@ sub NOCOMMITCHECK () { return 0x8; }
 our $debugprefix;
 our $debuglevel = 0;
 
+our $forkcheck_mainprocess;
+
+sub forkcheck_setup () {
+    $forkcheck_mainprocess = $$;
+}
+
+sub forkcheck_mainprocess () {
+    # You must have called forkcheck_setup or setup_sigwarn already
+    getppid != $forkcheck_mainprocess;
+}
+
 sub setup_sigwarn () {
-    our $sigwarn_mainprocess = $$;
+    forkcheck_setup();
     $SIG{__WARN__} = sub { 
-	die $_[0] unless getppid == $sigwarn_mainprocess;
+	die $_[0] if forkcheck_mainprocess;
     };
 }
 
-- 
cgit v1.2.3