From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-1297436-garchives=archives.gentoo.org@lists.gentoo.org> Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 2D3F7139335 for <garchives@archives.gentoo.org>; Tue, 29 Jun 2021 04:40:10 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 710E2E088A; Tue, 29 Jun 2021 04:40:09 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 4CA66E088A for <gentoo-commits@lists.gentoo.org>; Tue, 29 Jun 2021 04:40:09 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5DD27335D8A for <gentoo-commits@lists.gentoo.org>; Tue, 29 Jun 2021 04:40:06 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id DFDF47BD for <gentoo-commits@lists.gentoo.org>; Tue, 29 Jun 2021 04:40:04 +0000 (UTC) From: "Sam James" <sam@gentoo.org> To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" <sam@gentoo.org> Message-ID: <1624939922.5d171c2f33400acf8517e5ddbf0ad9e53bf8db25.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: mail-filter/spamassassin/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: mail-filter/spamassassin/files/update-spamassassin-rules-r1.cron X-VCS-Directories: mail-filter/spamassassin/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 5d171c2f33400acf8517e5ddbf0ad9e53bf8db25 X-VCS-Branch: master Date: Tue, 29 Jun 2021 04:40:04 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: e0b68d99-be75-413a-b633-d78c05cb10eb X-Archives-Hash: bba2705a4458f476c3a5083420ed5b4f commit: 5d171c2f33400acf8517e5ddbf0ad9e53bf8db25 Author: Hank Leininger <hlein <AT> korelogic <DOT> com> AuthorDate: Sun Jun 27 18:15:54 2021 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Tue Jun 29 04:12:02 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d171c2f mail-filter/spamassassin: Fixed command -v usage command -v writes to stdout, not stderr. As it happens this whole script is >/dev/null, so this instance is Mostly Harmless - unless someone copies it as an example of what to do. Signed-off-by: Hank Leininger <hlein <AT> korelogic.com> Bug: https://bugs.gentoo.org/798933 Package-Manager: Portage-3.0.20, Repoman-3.0.3 Closes: https://github.com/gentoo/gentoo/pull/21448 Signed-off-by: Sam James <sam <AT> gentoo.org> mail-filter/spamassassin/files/update-spamassassin-rules-r1.cron | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mail-filter/spamassassin/files/update-spamassassin-rules-r1.cron b/mail-filter/spamassassin/files/update-spamassassin-rules-r1.cron index 7c6990b847c..edac381b5de 100644 --- a/mail-filter/spamassassin/files/update-spamassassin-rules-r1.cron +++ b/mail-filter/spamassassin/files/update-spamassassin-rules-r1.cron @@ -19,7 +19,7 @@ if (( $? == 0 || $? == 3 )); then # Do you run spamd or amavisd? Both daemons need to be reloaded # in order to pick up the newly-updated rules. - if command -v rc-service 2>/dev/null; then + if command -v rc-service >/dev/null; then # OpenRC is installed. These "status" checks should succeed # only when the daemon is running under OpenRC. We redirect # stderr to hide the lecture that OpenRC gives you if you @@ -28,7 +28,7 @@ if (( $? == 0 || $? == 3 )); then rc-service amavisd status 2>/dev/null && rc-service amavisd reload fi - if command -v systemctl 2>/dev/null; then + if command -v systemctl >/dev/null; then # The systemctl (systemd) executable is installed, so try to # use it to restart spamd and amavisd. These are safe to run # if systemd is installed but not in use. The is-active