Gentoo Archives: gentoo-commits

From: Tobias Klausmann <klausman@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/chrony/files/, net-misc/chrony/
Date: Sun, 29 May 2016 16:25:41
Message-Id: 1464539116.420ee41fe4a94b6d6bc1c73305a1cf657a483804.klausman@gentoo
1 commit: 420ee41fe4a94b6d6bc1c73305a1cf657a483804
2 Author: Tobias Klausmann <klausman <AT> gentoo <DOT> org>
3 AuthorDate: Sun May 29 16:25:16 2016 +0000
4 Commit: Tobias Klausmann <klausman <AT> gentoo <DOT> org>
5 CommitDate: Sun May 29 16:25:16 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=420ee41f
7
8 net-misc/chrony: Fix logrotate script
9
10 Since grep -v may return a non-zero exit status even in the benign case, we
11 need to just return 0 manually. Actual errors will still be reported normally
12 since any output will trigger mail sending.
13
14 Package-Manager: portage-2.3.0_rc1
15
16 .../chrony/{chrony-2.4_pre1-r1.ebuild => chrony-2.4_pre1-r2.ebuild} | 2 +-
17 net-misc/chrony/files/{chrony-2.4.logrotate => chrony-2.4-r1.logrotate} | 2 +-
18 2 files changed, 2 insertions(+), 2 deletions(-)
19
20 diff --git a/net-misc/chrony/chrony-2.4_pre1-r1.ebuild b/net-misc/chrony/chrony-2.4_pre1-r2.ebuild
21 similarity index 98%
22 rename from net-misc/chrony/chrony-2.4_pre1-r1.ebuild
23 rename to net-misc/chrony/chrony-2.4_pre1-r2.ebuild
24 index 7d20e20..4f9b613 100644
25 --- a/net-misc/chrony/chrony-2.4_pre1-r1.ebuild
26 +++ b/net-misc/chrony/chrony-2.4_pre1-r2.ebuild
27 @@ -111,7 +111,7 @@ src_install() {
28 keepdir /var/{lib,log}/chrony
29
30 insinto /etc/logrotate.d
31 - newins "${FILESDIR}"/chrony-2.4.logrotate chrony
32 + newins "${FILESDIR}"/chrony-2.4-r1.logrotate chrony
33
34 systemd_newunit "${FILESDIR}"/chronyd.service-r2 chronyd.service
35 systemd_enable_ntpunit 50-chrony chronyd.service
36
37 diff --git a/net-misc/chrony/files/chrony-2.4.logrotate b/net-misc/chrony/files/chrony-2.4-r1.logrotate
38 similarity index 56%
39 rename from net-misc/chrony/files/chrony-2.4.logrotate
40 rename to net-misc/chrony/files/chrony-2.4-r1.logrotate
41 index d1ae72b..4140bc2 100644
42 --- a/net-misc/chrony/files/chrony-2.4.logrotate
43 +++ b/net-misc/chrony/files/chrony-2.4-r1.logrotate
44 @@ -2,6 +2,6 @@
45 missingok
46 sharedscripts
47 postrotate
48 - /usr/bin/chronyc cyclelogs |grep -v '^200 OK'
49 + /usr/bin/chronyc cyclelogs |grep -v '^200 OK'; return 0
50 endscript
51 }