patches/: Added types_list.dpatch.

This upstream patch improves error messages when handling "TypesDB".

diff --git a/debian/changelog b/debian/changelog
index 464d04c37d8d311f433a5ba2e47c4084bd4eb421..624a4656d2e82bb078accf4021c9d1c83578d234 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -27,6 +27,8 @@ collectd (4.6.1-1) unstable; urgency=low
     - Added postgresql_conf_fix.dpatch - upstream patch to fix the use of
       deprecated configuration options and to make sure the "disk_io" query
       does not return NULLs.
+    - Added types_list.dpatch - upstream patch to improved error messages when
+      handling "TypesDB".
   * debian/control:
     - Added new binary packages libcollectdclient0 and libcollectdclient-dev
       for the newly added client library.
@@ -44,7 +46,7 @@ collectd (4.6.1-1) unstable; urgency=low
     - Override "spelling-error-in-description" for the apache plugin name -
       all plugins are spelled lowercase.
 
- -- Sebastian Harl <sh@tokkee.org>  Mon, 09 Mar 2009 17:46:35 +0100
+ -- Sebastian Harl <sh@tokkee.org>  Tue, 10 Mar 2009 21:11:38 +0100
 
 collectd (4.5.1-1) experimental; urgency=low
 

diff --git a/debian/patches/00list b/debian/patches/00list
index 75ae68dd27324bf2fa715a79f226a005dc752b0f..349c0d51d8cad5fd46df9023f25d1725c469516f 100644 (file)
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -1,4 +1,5 @@
 rrd_filter_path.dpatch
 collection_conf_path.dpatch
 postgresql_conf_fix.dpatch
+types_list.dpatch
 

diff --git a/debian/patches/types_list.dpatch b/debian/patches/types_list.dpatch
new file mode 100755 (executable)
index 0000000..fc66d02
--- /dev/null
+++ b/debian/patches/types_list.dpatch
@@ -0,0 +1,22 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## types_list.dpatch by Sebastian Harl <sh@tokkee.org>
+##
+## DP: configfile, types_list:
+## DP: Improved error messages when handling "TypesDB".
+
+@DPATCH@
+
+diff a/src/types_list.c b/src/types_list.c
+--- a/src/types_list.c
++++ b/src/types_list.c
+@@ -172,7 +172,9 @@ int read_types_list (const char *file)
+   if (fh == NULL)
+   {
+     char errbuf[1024];
+-    ERROR ("open (%s) failed: %s", 
++    fprintf (stderr, "Failed to open types database `%s': %s.\n",
++      file, sstrerror (errno, errbuf, sizeof (errbuf)));
++    ERROR ("Failed to open types database `%s': %s",
+       file, sstrerror (errno, errbuf, sizeof (errbuf)));
+     return (-1);
+   }