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

Closes: #157305, #352554

diff --git a/ChangeLog b/ChangeLog
index 3d74ecf0d65983af0e0af08e49e2178d19ea4a29..4243fd9a06ca2a7780619cb8d3850e835b9da03a 100644 (file)
--- 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 38390005b0cb3b2c9e83717d5a049da5c57d60a4..d08e289685ad543a9ee6821781fb9df1c5bc474a 100644 (file)
--- 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 a1ef749065f57d0b0ec36d822fe0dcc1891a5e36..30bae5703d9bab778c2d8a705875c586a6cdb585 100644 (file)
--- 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)++;
                }
        }