* Replace the *.pid by a find command in logrotate file, so it's not failing

    if no pid file is present (Closes: #954202), thanks to Benjamin Drung for
    bug report and patch.

diff --git a/debian/changelog b/debian/changelog
index c08f67128f4d847f5a9d2633bca987552d5a28bc..23eb571b75990932fefb50f68af49dff8ffafd78 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,9 @@ openvswitch (2.13.0+dfsg1-4) UNRELEASED; urgency=medium
 
   * Blacklist failing tests on HPPA (Closes: #880514).
   * Blacklist failing tests on sparc64 (Closes: #888905).
+  * Replace the *.pid by a find command in logrotate file, so it's not failing
+    if no pid file is present (Closes: #954202), thanks to Benjamin Drung for
+    bug report and patch.
 
  -- Thomas Goirand <zigo@debian.org>  Sat, 21 Mar 2020 11:35:16 +0100
 

diff --git a/debian/openvswitch-switch.logrotate b/debian/openvswitch-switch.logrotate
index a7a71bdd90ad8f64b901d68136f45390500f3dd0..0c2920e3a6c6af657e0a8e71aa90af25ea013289 100644 (file)
--- a/debian/openvswitch-switch.logrotate
+++ b/debian/openvswitch-switch.logrotate
@@ -8,7 +8,7 @@
     postrotate
     # Tell Open vSwitch daemons to reopen their log files
     if [ -d /var/run/openvswitch ]; then
-        for pidfile in `cd /var/run/openvswitch && echo *.pid`; do
+        find /var/run/openvswitch -name '*.pid' -printf "%f\n" | while read -r pidfile; do
             ovs-appctl -t "${pidfile%%.pid}" vlog/reopen
         done
     fi