diff options
| -rw-r--r-- | sys-process/cronbase/cronbase-0.3.7-r2.ebuild (renamed from sys-process/cronbase/cronbase-0.3.7-r1.ebuild) | 0 | ||||
| -rwxr-xr-x | sys-process/cronbase/files/run-crons-0.3.7 | 6 |
2 files changed, 4 insertions, 2 deletions
diff --git a/sys-process/cronbase/cronbase-0.3.7-r1.ebuild b/sys-process/cronbase/cronbase-0.3.7-r2.ebuild index d263aeb11e0e..d263aeb11e0e 100644 --- a/sys-process/cronbase/cronbase-0.3.7-r1.ebuild +++ b/sys-process/cronbase/cronbase-0.3.7-r2.ebuild diff --git a/sys-process/cronbase/files/run-crons-0.3.7 b/sys-process/cronbase/files/run-crons-0.3.7 index c661c77a43fa..c5f2d9ca7b33 100755 --- a/sys-process/cronbase/files/run-crons-0.3.7 +++ b/sys-process/cronbase/files/run-crons-0.3.7 @@ -56,8 +56,10 @@ grab_lock() { # This is better than kill -0 because we can verify that it's really # another run-crons process. - cmdline1=$(cat "/proc/${cronpid}/cmdline" 2>/dev/null) || : - cmdline2=$(cat /proc/$$/cmdline) + # The tr call deletes null bytes so newer bash versions do not complain + # about them. + cmdline1=$(tr -d '\0' < "/proc/${cronpid}/cmdline" 2>/dev/null) || : + cmdline2=$(tr -d '\0' < /proc/$$/cmdline) if [ "${cmdline1}" = "${cmdline2}" ] ; then # Whoa, another run-crons is really running. return 1 |