From f590535e002f826c53e57743b47373c2f855aa244323cdfe73a3ee92fed5d819 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Fri, 17 Sep 2010 19:25:23 +0000 Subject: [PATCH] Accepting request 48132 from Base:System checked in (request 48132) OBS-URL: https://build.opensuse.org/request/show/48132 OBS-URL: https://build.opensuse.org/package/show/Base:System/logrotate?expand=0&rev=9 --- logrotate-3.7.8-suse.patch | 6 +++--- logrotate.changes | 6 ------ 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/logrotate-3.7.8-suse.patch b/logrotate-3.7.8-suse.patch index 500ffe8..d4005c0 100644 --- a/logrotate-3.7.8-suse.patch +++ b/logrotate-3.7.8-suse.patch @@ -22,7 +22,7 @@ Index: examples/logrotate.cron -EXITVALUE=$? +# exit immediately if there is another instance running +if checkproc /usr/sbin/logrotate; then -+ /bin/logger -p cron.warning -t logrotate "ALERT another instance of logrotate is running - exiting" ++ /bin/logger -t logrotate "ALERT another instance of logrotate is running - exiting" + exit 1; +fi; + @@ -36,8 +36,8 @@ Index: examples/logrotate.cron + # wait a sec, we might just have restarted syslog + sleep 1 + # tell what went wrong -+ /bin/logger -p cron.warning -t logrotate "ALERT exited abnormally with [$EXITVALUE]" -+ /bin/logger -p cron.warning -t logrotate -f $TMPF ++ /bin/logger -t logrotate "ALERT exited abnormally with [$EXITVALUE]" ++ /bin/logger -t logrotate -f $TMPF fi + +rm -f $TMPF diff --git a/logrotate.changes b/logrotate.changes index 118d450..d857e31 100644 --- a/logrotate.changes +++ b/logrotate.changes @@ -1,9 +1,3 @@ -------------------------------------------------------------------- -Tue Sep 14 13:01:46 UTC 2010 - puzel@novell.com - -- use proper syslog facility/priority in logrotate cron - script (bnc#636236) - ------------------------------------------------------------------- Tue Aug 17 15:29:49 UTC 2010 - puzel@novell.com