From: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Tue, 1 Jan 2008 03:45:10 +0000 (+0200)
Subject: s-s-d: Do not print 'failed to kill' warning when doing pid polling
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9ca339d341ab39043d26be6baa028b6b9012c747;p=dpkg

s-s-d: Do not print 'failed to kill' warning when doing pid polling

Closes: #157305, #352554
---

diff --git a/ChangeLog b/ChangeLog
index 3d74ecf0..4243fd9a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-01-01  Samuel Thibault  <samuel.thibault@ens-lyon.org>
+
+	* utils/start-stop-daemon.c (do_stop): Do not print 'failed to kill'
+	warning when doing pid polling.
+
 2008-01-01  Guillem Jover  <guillem@debian.org>
 
 	* src/archives.c (archivefiles): Remove pointless strdup for execvp
diff --git a/debian/changelog b/debian/changelog
index 38390005..d08e2896 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,6 +22,9 @@ dpkg (1.14.15) UNRELEASED; urgency=low
     Closes: #214684
     Thanks to Andreas Metzler and Ian Zimmerman.
   * Do not use strdup for execvp arguments. Closes: #379027
+  * Do not print 'failed to kill' warning in start-stop-daemon when polling
+    the pid. Closes: #157305, #352554
+    Thanks to Samuel Thibault.
 
   [ Updated dpkg translations ]
   * Norwegian Bokmål (Hans Fredrik Nordhaug). Closes: #457918
diff --git a/utils/start-stop-daemon.c b/utils/start-stop-daemon.c
index a1ef7490..30bae570 100644
--- a/utils/start-stop-daemon.c
+++ b/utils/start-stop-daemon.c
@@ -1079,8 +1079,9 @@ do_stop(int signal_nr, int quietmode, int *n_killed, int *n_notkilled, int retry
 			push(&killed, p->pid);
  			(*n_killed)++;
 		} else {
-			printf("%s: warning: failed to kill %d: %s\n",
-			       progname, p->pid, strerror(errno));
+			if (signal_nr)
+				printf("%s: warning: failed to kill %d: %s\n",
+				       progname, p->pid, strerror(errno));
  			(*n_notkilled)++;
 		}
 	}