From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id AA7B013829B for ; Sun, 29 May 2016 16:25:41 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2350A940D3; Sun, 29 May 2016 16:25:39 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C59E4940D3 for ; Sun, 29 May 2016 16:25:38 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B0EA0340A7B for ; Sun, 29 May 2016 16:25:37 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5BF1E180 for ; Sun, 29 May 2016 16:25:33 +0000 (UTC) From: "Tobias Klausmann" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Tobias Klausmann" Message-ID: <1464539116.420ee41fe4a94b6d6bc1c73305a1cf657a483804.klausman@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/chrony/files/, net-misc/chrony/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-misc/chrony/chrony-2.4_pre1-r1.ebuild net-misc/chrony/chrony-2.4_pre1-r2.ebuild net-misc/chrony/files/chrony-2.4-r1.logrotate net-misc/chrony/files/chrony-2.4.logrotate X-VCS-Directories: net-misc/chrony/files/ net-misc/chrony/ X-VCS-Committer: klausman X-VCS-Committer-Name: Tobias Klausmann X-VCS-Revision: 420ee41fe4a94b6d6bc1c73305a1cf657a483804 X-VCS-Branch: master Date: Sun, 29 May 2016 16:25:33 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: a8141cd1-620c-4799-abe9-6891be28e90e X-Archives-Hash: ecf53fc4883d3888bb1917db5f36d4c9 commit: 420ee41fe4a94b6d6bc1c73305a1cf657a483804 Author: Tobias Klausmann gentoo org> AuthorDate: Sun May 29 16:25:16 2016 +0000 Commit: Tobias Klausmann gentoo org> CommitDate: Sun May 29 16:25:16 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=420ee41f net-misc/chrony: Fix logrotate script Since grep -v may return a non-zero exit status even in the benign case, we need to just return 0 manually. Actual errors will still be reported normally since any output will trigger mail sending. Package-Manager: portage-2.3.0_rc1 .../chrony/{chrony-2.4_pre1-r1.ebuild => chrony-2.4_pre1-r2.ebuild} | 2 +- net-misc/chrony/files/{chrony-2.4.logrotate => chrony-2.4-r1.logrotate} | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/net-misc/chrony/chrony-2.4_pre1-r1.ebuild b/net-misc/chrony/chrony-2.4_pre1-r2.ebuild similarity index 98% rename from net-misc/chrony/chrony-2.4_pre1-r1.ebuild rename to net-misc/chrony/chrony-2.4_pre1-r2.ebuild index 7d20e20..4f9b613 100644 --- a/net-misc/chrony/chrony-2.4_pre1-r1.ebuild +++ b/net-misc/chrony/chrony-2.4_pre1-r2.ebuild @@ -111,7 +111,7 @@ src_install() { keepdir /var/{lib,log}/chrony insinto /etc/logrotate.d - newins "${FILESDIR}"/chrony-2.4.logrotate chrony + newins "${FILESDIR}"/chrony-2.4-r1.logrotate chrony systemd_newunit "${FILESDIR}"/chronyd.service-r2 chronyd.service systemd_enable_ntpunit 50-chrony chronyd.service diff --git a/net-misc/chrony/files/chrony-2.4.logrotate b/net-misc/chrony/files/chrony-2.4-r1.logrotate similarity index 56% rename from net-misc/chrony/files/chrony-2.4.logrotate rename to net-misc/chrony/files/chrony-2.4-r1.logrotate index d1ae72b..4140bc2 100644 --- a/net-misc/chrony/files/chrony-2.4.logrotate +++ b/net-misc/chrony/files/chrony-2.4-r1.logrotate @@ -2,6 +2,6 @@ missingok sharedscripts postrotate - /usr/bin/chronyc cyclelogs |grep -v '^200 OK' + /usr/bin/chronyc cyclelogs |grep -v '^200 OK'; return 0 endscript }