From: Sebastian Harl <sh@tokkee.org>
Date: Sat, 20 Dec 2008 13:39:23 +0000 (+0100)
Subject: debian/patches: Removed bts496847-error-handling.
X-Git-Tag: debian/1.3.7-1~28
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=142795c6ee2d3fe8740a4603eddc859507749593;p=pkg-rrdtool.git

debian/patches: Removed bts496847-error-handling.

This patch is now included upstream.
---

diff --git a/debian/changelog b/debian/changelog
index 69d3f5c..b2a309f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,8 +6,9 @@ rrdtool (1.3.5-1) unstable; urgency=low
       version of rrdtool; use rrd_free2() instead of rrd_free() to not leak
       memory.
     - Removed bts493553-pango-utf-8 - included upstream.
+    - Removed bts496847-error-handling - included upstream.
 
- -- Sebastian Harl <sh@tokkee.org>  Sat, 20 Dec 2008 14:36:01 +0100
+ -- Sebastian Harl <sh@tokkee.org>  Sat, 20 Dec 2008 14:39:01 +0100
 
 rrdtool (1.3.1-4) unstable; urgency=high
 
diff --git a/debian/patches/bts496847-error-handling b/debian/patches/bts496847-error-handling
deleted file mode 100644
index 34fc0c2..0000000
--- a/debian/patches/bts496847-error-handling
+++ /dev/null
@@ -1,79 +0,0 @@
-diff a/src/rrd_tool.c b/src/rrd_tool.c
---- a/src/rrd_tool.c
-+++ b/src/rrd_tool.c
-@@ -424,11 +424,8 @@ int main(
-                    == 0) {
- 
- #ifdef HAVE_CHROOT
--                chroot(argv[2]);
--                if (errno != 0) {
--                    fprintf(stderr,
--                            "ERROR: can't change root to '%s' errno=%d\n",
--                            argv[2], errno);
-+                if (chroot(argv[2]) != 0){
-+                    fprintf(stderr, "ERROR: chroot %s: %s\n", argv[2],rrd_strerror(errno));
-                     exit(errno);
-                 }
-                 ChangeRoot = 1;
-@@ -444,9 +441,8 @@ int main(
-             }
-         }
-         if (strcmp(firstdir, "")) {
--            chdir(firstdir);
--            if (errno != 0) {
--                fprintf(stderr, "ERROR: %s\n", rrd_strerror(errno));
-+            if (chdir(firstdir) != 0){
-+                fprintf(stderr, "ERROR: chdir %s %s\n", firstdir,rrd_strerror(errno));
-                 exit(errno);
-             }
-         }
-@@ -520,7 +516,6 @@ int HandleInputLine(
- 
-     /* Reset errno to 0 before we start.
-      */
--    errno = 0;
-     if (RemoteMode) {
-         if (argc > 1 && strcmp("quit", argv[1]) == 0) {
-             if (argc > 2) {
-@@ -543,9 +538,8 @@ int HandleInputLine(
-                 return (1);
-             }
- #endif
--            chdir(argv[2]);
--            if (errno != 0) {
--                printf("ERROR: %s\n", rrd_strerror(errno));
-+            if (chdir(argv[2]) != 0){
-+                printf("ERROR: chdir %s %s\n", argv[2], rrd_strerror(errno));
-                 return (1);
-             }
-             return (0);
-@@ -557,7 +551,7 @@ int HandleInputLine(
-             }
-             cwd = getcwd(NULL, MAXPATH);
-             if (cwd == NULL) {
--                printf("ERROR: %s\n", rrd_strerror(errno));
-+                printf("ERROR: getcwd %s\n", rrd_strerror(errno));
-                 return (1);
-             }
-             printf("%s\n", cwd);
-@@ -577,9 +571,8 @@ int HandleInputLine(
-                 return (1);
-             }
- #endif
--            mkdir(argv[2], 0777);
--            if (errno != 0) {
--                printf("ERROR: %s\n", rrd_strerror(errno));
-+            if(mkdir(argv[2], 0777)!=0){
-+                printf("ERROR: mkdir %s: %s\n", argv[2],rrd_strerror(errno));
-                 return (1);
-             }
-             return (0);
-@@ -607,7 +600,7 @@ int HandleInputLine(
-                 }
-                 closedir(curdir);
-             } else {
--                printf("ERROR: %s\n", rrd_strerror(errno));
-+                printf("ERROR: opendir .: %s\n", rrd_strerror(errno));
-                 return (errno);
-             }
-             return (0);
diff --git a/debian/patches/series b/debian/patches/series
index 7c87e23..c64c5b1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,6 +5,5 @@ no-rpath-for-perl
 implicit-decl-fix
 bts499350-data-corruption
 bts498183-segfault-madvise
-bts496847-error-handling
 bts499349-memleaks
 typo-ruby