summaryrefslogtreecommitdiff
path: root/infra/dgit-repos-server
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2015-07-25 16:30:09 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2015-07-25 17:56:42 +0100
commitd6be829bf56e699d27d388026d4af7ab710ba328 (patch)
treea4eb3ec080271e145d99200a43a3f5d3271e41bc /infra/dgit-repos-server
parent9141753fb5096b41074684d5bdfbb0c6f69a0c1a (diff)
Work around #793471 (madness with $SIG{__WARN__} and Perl's system builtin): move $SIG{} setting into setup_sigwarn in Dgit.pm, and check getppid.
We also need to fix up the expectation for an error message in one of the tests, where the message changes as a side effect.
Diffstat (limited to 'infra/dgit-repos-server')
-rwxr-xr-xinfra/dgit-repos-server6
1 files changed, 3 insertions, 3 deletions
diff --git a/infra/dgit-repos-server b/infra/dgit-repos-server
index 92f197b..9705a64 100755
--- a/infra/dgit-repos-server
+++ b/infra/dgit-repos-server
@@ -33,7 +33,9 @@
# (With --cron AUTH-SPEC is not used and may be the empty string.)
use strict;
-$SIG{__WARN__} = sub { die $_[0]; };
+
+use Debian::Dgit qw(:DEFAULT :policyflags);
+setup_sigwarn();
# DGIT-REPOS-DIR contains:
# git tree (or other object) lock (in acquisition order, outer first)
@@ -189,8 +191,6 @@ use Fcntl qw(:flock);
use File::Path qw(rmtree);
use File::Temp qw(tempfile);
-use Debian::Dgit qw(:DEFAULT :policyflags);
-
initdebug('');
our $func;