rpms/logrotate/devel logrotate-3.7.1-scriptFailInfo.patch, NONE, 1.1 logrotate.spec, 1.25, 1.26

[fedora-cvs-commits at redhat.com]

Author: pvrabec

Update of /cvs/dist/rpms/logrotate/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25796

Modified Files:
	logrotate.spec 
Added Files:
	logrotate-3.7.1-scriptFailInfo.patch 
Log Message:
fix some "error running script" messages


logrotate-3.7.1-scriptFailInfo.patch:
 logrotate.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE logrotate-3.7.1-scriptFailInfo.patch ---
--- logrotate-3.7.1/logrotate.c.scriptFailInfo	2005-07-26 16:03:15.000000000 +0200
+++ logrotate-3.7.1/logrotate.c	2005-07-26 16:20:42.000000000 +0200
@@ -761,8 +761,8 @@
         if (log->pre && !(log->flags & LOG_FLAG_SHAREDSCRIPTS)) {
             message(MESS_DEBUG, "running prerotate script\n");
             if (runScript(log->files[logNum], log->pre)) {
-                message(MESS_ERROR, "error running prerotate script, "
-			"leaving old log in place\n");
+                message(MESS_ERROR, "error running prerotate script for %s, "
+			"leaving old log in place\n", log->pattern);
                 hasErrors = 1;
 	    }
         }
@@ -844,7 +844,7 @@
 	    !(log->flags & LOG_FLAG_SHAREDSCRIPTS)) {
             message(MESS_DEBUG, "running postrotate script\n");
             if (runScript(log->files[logNum], log->post)) {
-                message(MESS_ERROR, "error running postrotate script\n");
+                message(MESS_ERROR, "error running postrotate script for %s\n", log->pattern);
                 hasErrors = 1;
 	    }
         }


Index: logrotate.spec
===================================================================
RCS file: /cvs/dist/rpms/logrotate/devel/logrotate.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- logrotate.spec	26 Jul 2005 13:47:08 -0000	1.25
+++ logrotate.spec	26 Jul 2005 14:42:07 -0000	1.26
@@ -5,7 +5,7 @@
 Summary: Rotates, compresses, removes and mails system log files.
 Name: logrotate
 Version: 3.7.1
-Release: 12
+Release: 14
 License: GPL
 Group: System Environment/Base
 Source: logrotate-%{PACKAGE_VERSION}.tar.gz
@@ -16,6 +16,7 @@
 Patch4: logrotate-3.7.1-selinux.patch
 Patch5: logrotate-3.7.1-dateext.patch
 Patch6: logrotate-3.7.1-maxage.patch
+Patch7: logrotate-3.7.1-scriptFailInfo.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}.root
 
 %description
@@ -38,6 +39,7 @@
 %patch4 -p1 -b .selinux
 %patch5 -p1 -b .dateext
 %patch6 -p1 -b .maxage
+%patch7 -p1 -b .scriptFailInfo
 
 %build
 make RPM_OPT_FLAGS="$RPM_OPT_FLAGS -g" \
@@ -70,6 +72,9 @@
 %attr(0644, root, root) %verify(not size md5 mtime) %config(noreplace) /var/lib/logrotate.status
 
 %changelog
+* Tue Jul 26 2005 Peter Vrabec <pvrabec at redhat.com> 3.7.1-14
+- fix some "error running script" messages
+
 * Tue Jul 26 2005 Peter Vrabec <pvrabec at redhat.com> 3.7.1-13
 - fix man page (#163458,#163366)