From owner-svn-src-stable@freebsd.org Tue Nov 27 19:45:25 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 8D6BA1159BEA; Tue, 27 Nov 2018 19:45:25 +0000 (UTC) (envelope-from vangyzen@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 3438D699A7; Tue, 27 Nov 2018 19:45:25 +0000 (UTC) (envelope-from vangyzen@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 1642C1FE76; Tue, 27 Nov 2018 19:45:25 +0000 (UTC) (envelope-from vangyzen@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wARJjOEB037941; Tue, 27 Nov 2018 19:45:24 GMT (envelope-from vangyzen@FreeBSD.org) Received: (from vangyzen@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wARJjOOX037940; Tue, 27 Nov 2018 19:45:24 GMT (envelope-from vangyzen@FreeBSD.org) Message-Id: <201811271945.wARJjOOX037940@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: vangyzen set sender to vangyzen@FreeBSD.org using -f From: Eric van Gyzen Date: Tue, 27 Nov 2018 19:45:24 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r341092 - stable/12/usr.sbin/periodic/etc/daily X-SVN-Group: stable-12 X-SVN-Commit-Author: vangyzen X-SVN-Commit-Paths: stable/12/usr.sbin/periodic/etc/daily X-SVN-Commit-Revision: 341092 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 3438D699A7 X-Spamd-Result: default: False [1.23 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_SPAM_LONG(0.44)[0.441,0]; NEURAL_SPAM_SHORT(0.16)[0.157,0]; NEURAL_SPAM_MEDIUM(0.63)[0.632,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-Rspamd-Server: mx1.freebsd.org X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 27 Nov 2018 19:45:25 -0000 Author: vangyzen Date: Tue Nov 27 19:45:24 2018 New Revision: 341092 URL: https://svnweb.freebsd.org/changeset/base/341092 Log: MFC r340345 Fix daily mailq script for Postfix and daily_show_success="NO" Exit with a zero status when Postfix reports "Mail queue is empty" so this section won't appear in the report at all when daily_show_success="NO". Sponsored by: Dell EMC Isilon Modified: stable/12/usr.sbin/periodic/etc/daily/440.status-mailq Directory Properties: stable/12/ (props changed) Modified: stable/12/usr.sbin/periodic/etc/daily/440.status-mailq ============================================================================== --- stable/12/usr.sbin/periodic/etc/daily/440.status-mailq Tue Nov 27 19:44:39 2018 (r341091) +++ stable/12/usr.sbin/periodic/etc/daily/440.status-mailq Tue Nov 27 19:45:24 2018 (r341092) @@ -33,7 +33,7 @@ case "$daily_status_mailq_enable" in *) mailq;; esac | tee /dev/stderr | - egrep -v '(mqueue is empty|Total requests)' | wc -l) + egrep -v '((Mail |m)queue is empty|Total requests)' | wc -l) [ $rc -gt 0 ] && rc=1 || rc=0 case "$daily_status_include_submit_mailq" in