[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[lintian] 01/01: cmd/r-l-harness: Check for signals even on "clean" exits



This is an automated email from the git hooks/post-receive script.

nthykier pushed a commit to branch master
in repository lintian.

commit 43e5f8c01b6e14a48c8b1ba7fd771aba47001633
Author: Niels Thykier <niels@thykier.net>
Date:   Mon Oct 2 18:19:13 2017 +0000

    cmd/r-l-harness: Check for signals even on "clean" exits
    
    Signed-off-by: Niels Thykier <niels@thykier.net>
---
 commands/reporting-lintian-harness.pm | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/commands/reporting-lintian-harness.pm b/commands/reporting-lintian-harness.pm
index 4c15e93..d1dff04 100644
--- a/commands/reporting-lintian-harness.pm
+++ b/commands/reporting-lintian-harness.pm
@@ -360,12 +360,22 @@ sub process_worklist {
             my $sig = $? & 0xff;
             if ($res != 1 and $res != 0) {
                 log_msg("warning: executing lintian returned $res");
+                if ($got_alarm) {
+                    # Ideally, lintian would always die by the signal
+                    # but some times it catches it and terminates
+                    # "normally"
+                    log_msg('Stopped by a signal or time out');
+                    log_msg(' - skipping the rest of the worklist');
+                    @worklist = ();
+                }
             } elsif ($sig) {
                 log_msg("Lintian terminated by signal: $sig");
                 # If someone is sending us signals (e.g. SIGINT/Ctrl-C)
                 # don't start the next round.
                 log_msg(' - skipping the rest of the worklist');
                 @worklist = ();
+            }
+            if ($got_alarm) {
                 if ($got_alarm == 1) {
                     # Lintian was (presumably) killed due to a
                     # time-out from this process

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/lintian/lintian.git


Reply to: