From d6be829bf56e699d27d388026d4af7ab710ba328 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sat, 25 Jul 2015 16:30:09 +0100 Subject: 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. --- infra/dgit-repos-server | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'infra/dgit-repos-server') 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; -- cgit v1.2.1