summaryrefslogtreecommitdiff
path: root/debian/patches/quieter-signals.patch
blob: 32f4cfc6710ff2dd1a963473d1e8c2b143086eee (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
Description: Reduce severity of "Killed by signal %d"
 This produces irritating messages when using ProxyCommand or other programs
 that use ssh under the covers (e.g. Subversion).  These messages are more
 normally printed by the calling program, such as the shell.
 .
 According to the upstream bug, the right way to avoid this is to use the -q
 option, so we may drop this patch after further investigation into whether
 any software in Debian is still relying on it.
Author: Peter Samuelson <peter@p12n.org>
Author: Colin Watson <cjwatson@debian.org>
Bug: https://bugzilla.mindrot.org/show_bug.cgi?id=1118
Bug-Debian: http://bugs.debian.org/313371
Last-Update: 2013-09-14

Index: b/clientloop.c
===================================================================
--- a/clientloop.c
+++ b/clientloop.c
@@ -1717,8 +1717,10 @@
 		exit_status = 0;
 	}
 
-	if (received_signal)
-		fatal("Killed by signal %d.", (int) received_signal);
+	if (received_signal) {
+		debug("Killed by signal %d.", (int) received_signal);
+		cleanup_exit((int) received_signal + 128);
+	}
 
 	/*
 	 * In interactive mode (with pseudo tty) display a message indicating