app-admin/diamond: (stable) revbump for init.d fix

Ensure a missing pid-file doesn't result in more killing than healthy. Package-Manager: Portage-3.0.9, Repoman-3.0.2 RepoMan-Options: --force Signed-off-by: Fabian Groffen <[email protected]>
hanetzer · Dec 5, 2020 · 49a881a · 49a881a
1 parent 78f8b94
commit 49a881a
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/...n/diamond/diamond-4.0.515.20170311.ebuild → ...iamond/diamond-4.0.515.20170311-r1.ebuild b/...n/diamond/diamond-4.0.515.20170311.ebuild → ...iamond/diamond-4.0.515.20170311-r1.ebuild
diff --git a/...n/diamond/diamond-4.0.515.20200620.ebuild → ...iamond/diamond-4.0.515.20200620-r1.ebuild b/...n/diamond/diamond-4.0.515.20200620.ebuild → ...iamond/diamond-4.0.515.20200620-r1.ebuild
diff --git a/app-admin/diamond/files/diamond.initd b/app-admin/diamond/files/diamond.initd
@@ -16,6 +16,9 @@ stop() {
  ebegin "Stopping ${SVCNAME}"
  #start-stop-daemon --stop -R 80 --pidfile /run/${SVCNAME}.pid
  # diamond doesn't kill its children, so work around that for now
- pstree -Tp `cat /run/${SVCNAME}.pid` | grep -o '([0-9]\+)' | tr '()' ' ' | xargs kill
+ pid=$(< /run/${SVCNAME}.pid)
+ if [ -n ${pid} ] && [ ${pid} -gt 1 ] ; then
+ pstree -Tp ${pid} | grep -o '([0-9]\+)' | tr '()' ' ' | xargs kill
+ fi
  eend $?
 }