[Pkg-cvs-commits] r65 - in /trunk: changelog patches/30_quieten_syslog_errors

[93sam at users.alioth.debian.org]

Author: 93sam
Date: Fri Dec  7 00:17:13 2007
New Revision: 65

URL: http://svn.debian.org/wsvn/?sc=1&rev=65
Log:
  * Don't be so loud on errors. Closes: #386153

Added:
    trunk/patches/30_quieten_syslog_errors
Modified:
    trunk/changelog

Modified: trunk/changelog
URL: http://svn.debian.org/wsvn/trunk/changelog?rev=65&op=diff
==============================================================================
--- trunk/changelog (original)
+++ trunk/changelog Fri Dec  7 00:17:13 2007
@@ -1,3 +1,9 @@
+cvs (1:1.12.13-9) unstable; urgency=low
+
+  * Don't be so loud on errors. Closes: #386153
+
+ -- Steve McIntyre <93sam at debian.org>  Fri,  7 Dec 2007 00:12:23 +0000
+
 cvs (1:1.12.13-8) unstable; urgency=medium
 
   * Update Russian debconf translation, Thanks to Yuriy Talakan.

Added: trunk/patches/30_quieten_syslog_errors
URL: http://svn.debian.org/wsvn/trunk/patches/30_quieten_syslog_errors?rev=65&op=file
==============================================================================
--- trunk/patches/30_quieten_syslog_errors (added)
+++ trunk/patches/30_quieten_syslog_errors Fri Dec  7 00:17:13 2007
@@ -0,0 +1,38 @@
+# Don't be so loud on errors. Closes: #386153
+# Steve McIntyre <steve at einval.com>
+diff -ruN cvs-1.12.13-old/src/error.c cvs-1.12.13/src/error.c
+--- cvs-1.12.13-old/src/error.c	2005-06-03 17:06:07.000000000 +0100
++++ cvs-1.12.13/src/error.c	2007-12-07 00:07:12.000000000 +0000
+@@ -208,7 +208,7 @@
+      *   with the message here.
+      */
+ #if HAVE_SYSLOG_H
+-    syslog (LOG_DAEMON | LOG_EMERG, "Memory exhausted.  Aborting.");
++    syslog (LOG_DAEMON, "Memory exhausted.  Aborting.");
+ #endif /* HAVE_SYSLOG_H */
+ 
+     goto sidestep_done;
+@@ -219,18 +219,18 @@
+      * error while attempting to send the last error message to the client.
+      */
+ 
+-    syslog (LOG_DAEMON | LOG_EMERG,
++    syslog (LOG_DAEMON,
+ 	    "error (%d, %d) called recursively.  Original message was:",
+ 	    last_status, last_errnum);
+-    syslog (LOG_DAEMON | LOG_EMERG, "%s", last_message);
++    syslog (LOG_DAEMON, "%s", last_message);
+ 
+ 
+-    syslog (LOG_DAEMON | LOG_EMERG,
++    syslog (LOG_DAEMON,
+             "error (%d, %d) called recursively.  Second message was:",
+ 	    status, errnum);
+-    syslog (LOG_DAEMON | LOG_EMERG, "%s", buf2);
++    syslog (LOG_DAEMON, "%s", buf2);
+ 
+-    syslog (LOG_DAEMON | LOG_EMERG, "Aborting.");
++    syslog (LOG_DAEMON, "Aborting.");
+ #endif /* HAVE_SYSLOG_H */
+ 
+ sidestep_done: