diff options
| author |   Fabian Groffen <grobian@gentoo.org> | 2020-12-05 10:35:16 +0100 |
|---|---|---|
| committer | Fabian Groffen <grobian@gentoo.org> | 2020-12-05 10:35:32 +0100 |
| commit | 49a881ac2c9c2725ae8f869afea1fe932f97b1ac (patch) | |
| tree | 28d5d4594cbd67aa9abeb97d57a062e405d38c68 | |
| parent | xfce-extra/xfce4-windowck-plugin: Support python3_{8,9} (diff) | |
| download | gentoo-49a881ac.tar.gz gentoo-49a881ac.tar.bz2 gentoo-49a881ac.zip | |
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 <grobian@gentoo.org>
| -rw-r--r-- | app-admin/diamond/diamond-4.0.515.20170311-r1.ebuild (renamed from app-admin/diamond/diamond-4.0.515.20170311.ebuild) | 0 | ||||
| -rw-r--r-- | app-admin/diamond/diamond-4.0.515.20200620-r1.ebuild (renamed from app-admin/diamond/diamond-4.0.515.20200620.ebuild) | 0 | ||||
| -rw-r--r-- | app-admin/diamond/files/diamond.initd | 5 |
3 files changed, 4 insertions, 1 deletions
diff --git a/app-admin/diamond/diamond-4.0.515.20170311.ebuild b/app-admin/diamond/diamond-4.0.515.20170311-r1.ebuild index 80dbc4734ecc..80dbc4734ecc 100644 --- a/app-admin/diamond/diamond-4.0.515.20170311.ebuild +++ b/app-admin/diamond/diamond-4.0.515.20170311-r1.ebuild diff --git a/app-admin/diamond/diamond-4.0.515.20200620.ebuild b/app-admin/diamond/diamond-4.0.515.20200620-r1.ebuild index 938b0d14ce90..938b0d14ce90 100644 --- a/app-admin/diamond/diamond-4.0.515.20200620.ebuild +++ b/app-admin/diamond/diamond-4.0.515.20200620-r1.ebuild diff --git a/app-admin/diamond/files/diamond.initd b/app-admin/diamond/files/diamond.initd index a2383fd31875..f9b829488c79 100644 --- 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 $? } |