public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: mail-filter/spamassassin/files/
Date: Tue, 29 Jun 2021 04:40:04 +0000 (UTC)	[thread overview]
Message-ID: <1624939922.5d171c2f33400acf8517e5ddbf0ad9e53bf8db25.sam@gentoo> (raw)

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


             reply	other threads:[~2021-06-29  4:40 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-06-29  4:40 Sam James [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-01-27  8:50 [gentoo-commits] repo/gentoo:master commit in: mail-filter/spamassassin/files/ Joonas Niilola
2020-03-16 11:48 Joonas Niilola
2019-01-21 22:51 Patrice Clement
2018-09-04 22:32 Patrice Clement
2017-11-28 20:01 Michael Orlitzky
2017-09-06 17:27 Michael Orlitzky
2017-08-20 14:50 Michael Orlitzky
2016-06-07  0:44 Michael Orlitzky

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1624939922.5d171c2f33400acf8517e5ddbf0ad9e53bf8db25.sam@gentoo \
    --to=sam@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox