From 5b7ab636f3d05ba3a7cd1629abbece5fd99354b4 Mon Sep 17 00:00:00 2001 From: Sebastian Harl Date: Tue, 10 Mar 2009 21:12:38 +0100 Subject: [PATCH] patches/: Added types_list.dpatch. This upstream patch improves error messages when handling "TypesDB". --- debian/changelog | 4 +++- debian/patches/00list | 1 + debian/patches/types_list.dpatch | 22 ++++++++++++++++++++++ 3 files changed, 26 insertions(+), 1 deletion(-) create mode 100755 debian/patches/types_list.dpatch diff --git a/debian/changelog b/debian/changelog index 464d04c..624a465 100644 --- 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 Mon, 09 Mar 2009 17:46:35 +0100 + -- Sebastian Harl 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 75ae68d..349c0d5 100644 --- 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 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 +## +## 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); + } -- 2.30.2