* [gentoo-commits] repo/gentoo:master commit in: sys-process/cronbase/, sys-process/cronbase/files/
@ 2016-09-30 7:25 99% Tobias Klausmann
0 siblings, 0 replies; 1+ results
From: Tobias Klausmann @ 2016-09-30 7:25 UTC (permalink / raw
To: gentoo-commits
commit: 7c266d7a1854b3b1b543fb35036d3e4e6c3135cf
Author: Tobias Klausmann <klausman <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 30 07:22:54 2016 +0000
Commit: Tobias Klausmann <klausman <AT> gentoo <DOT> org>
CommitDate: Fri Sep 30 07:25:22 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c266d7a
sys-process/cronbase: avoid bash complaining about null bytes
Newer versions of bash warn about null bytes in command substitutions,
so run-crons would generate mails with messages like this:
/usr/sbin/run-crons: line 59: warning: command substitution: ignored null byte in input
/usr/sbin/run-crons: line 59: warning: command substitution: ignored null byte in input
/usr/sbin/run-crons: line 60: warning: command substitution: ignored null byte in input
/usr/sbin/run-crons: line 60: warning: command substitution: ignored null byte in input
Since the warning is not useful and the resultant string has its null
bytes deleted, we might as well delete them with tr and get rid of the
warning.
.../cronbase/{cronbase-0.3.7-r1.ebuild => cronbase-0.3.7-r2.ebuild} | 0
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
similarity index 100%
rename from sys-process/cronbase/cronbase-0.3.7-r1.ebuild
rename to 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 c661c77..c5f2d9c 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
^ permalink raw reply related [relevance 99%]
Results 1-1 of 1 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2016-09-30 7:25 99% [gentoo-commits] repo/gentoo:master commit in: sys-process/cronbase/, sys-process/cronbase/files/ Tobias Klausmann
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox