[pgrouting] 02/03: Add patch to fix 'exception' typo.

Bas Couwenberg sebastic at debian.org
Sun Sep 25 14:45:55 UTC 2016


This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository pgrouting.

commit 2a51f601d5d4e4c4066ee8c39b97df6753236c08
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sun Sep 25 16:29:52 2016 +0200

    Add patch to fix 'exception' typo.
---
 debian/changelog                    |   1 +
 debian/patches/exception-typo.patch | 202 ++++++++++++++++++++++++++++++++++++
 debian/patches/series               |   1 +
 3 files changed, 204 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 687d00c..2a0d3a4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ pgrouting (2.2.4-2) UNRELEASED; urgency=medium
 
   * Team upload.
   * Update packaging for postgresql 9.6 & postgis 2.3.
+  * Add patch to fix 'exception' typo.
 
  -- Bas Couwenberg <sebastic at debian.org>  Sat, 24 Sep 2016 19:35:00 +0200
 
diff --git a/debian/patches/exception-typo.patch b/debian/patches/exception-typo.patch
new file mode 100644
index 0000000..f66823b
--- /dev/null
+++ b/debian/patches/exception-typo.patch
@@ -0,0 +1,202 @@
+Description: Fix 'expection' typo, replace with 'exception'.
+Author: Bas Couwenberg <sebastic at debian.org>
+Forwarded: https://github.com/pgRouting/pgrouting/pull/681
+
+--- a/src/allpairs/src/floydWarshall_driver.cpp
++++ b/src/allpairs/src/floydWarshall_driver.cpp
+@@ -88,7 +88,7 @@ do_pgr_floydWarshall(
+ #endif
+     return;
+   } catch ( ... ) {
+-    log << "Caught unknown expection!\n";
++    log << "Caught unknown exception!\n";
+     *err_msg = strdup(log.str().c_str());
+     *postgres_rows = NULL;
+     *result_tuple_count = 0;
+--- a/src/allpairs/src/johnson_driver.cpp
++++ b/src/allpairs/src/johnson_driver.cpp
+@@ -95,7 +95,7 @@ do_pgr_johnson(
+       *err_msg = strdup(log.str().c_str());
+     #endif
+   } catch ( ... ) {
+-    log << "Caught unknown expection!\n";
++    log << "Caught unknown exception!\n";
+     *err_msg = strdup(log.str().c_str());
+   }
+ }
+--- a/src/alpha_shape/src/alpha_drivedist.cpp
++++ b/src/alpha_shape/src/alpha_drivedist.cpp
+@@ -294,7 +294,7 @@ int alpha_shape(vertex_t *vertices, size
+ 
+   return EXIT_SUCCESS;
+     } catch ( ... ) {
+-        *err_msg = strdup("Caught unknown expection!");
++        *err_msg = strdup("Caught unknown exception!");
+     }
+         return -1;
+ 
+--- a/src/dijkstra/src/dijkstraVia_driver.cpp
++++ b/src/dijkstra/src/dijkstraVia_driver.cpp
+@@ -232,7 +232,7 @@ do_pgr_dijkstraViaVertex(
+         *err_msg = strdup(log.str().c_str());
+ #endif
+     } catch ( ... ) {
+-        log << "Caught unknown expection!\n";
++        log << "Caught unknown exception!\n";
+         *err_msg = strdup(log.str().c_str());
+     }
+ }
+--- a/src/dijkstra/src/many_to_many_dijkstra_driver.cpp
++++ b/src/dijkstra/src/many_to_many_dijkstra_driver.cpp
+@@ -119,7 +119,7 @@ do_pgr_many_to_many_dijkstra(
+ 
+         return;
+     } catch ( ... ) {
+-        log << "Caught unknown expection!\n";
++        log << "Caught unknown exception!\n";
+         *err_msg = strdup(log.str().c_str());
+         return;
+     }
+--- a/src/dijkstra/src/many_to_one_dijkstra_driver.cpp
++++ b/src/dijkstra/src/many_to_one_dijkstra_driver.cpp
+@@ -114,7 +114,7 @@ do_pgr_many_to_one_dijkstra(
+ 
+         return;
+     } catch ( ... ) {
+-        log << "Caught unknown expection!\n";
++        log << "Caught unknown exception!\n";
+         *err_msg = strdup(log.str().c_str());
+         return;
+     }
+--- a/src/dijkstra/src/one_to_many_dijkstra_driver.cpp
++++ b/src/dijkstra/src/one_to_many_dijkstra_driver.cpp
+@@ -106,8 +106,8 @@ do_pgr_one_to_many_dijkstra(
+ 
+     return;
+   } catch ( ... ) {
+-      log << "Caught unknown expection!\n";
+-      *err_msg = strdup("Caught unknown expection!\n");
++      log << "Caught unknown exception!\n";
++      *err_msg = strdup("Caught unknown exception!\n");
+       return;
+   }
+ }
+--- a/src/dijkstra/src/one_to_one_dijkstra_driver.cpp
++++ b/src/dijkstra/src/one_to_one_dijkstra_driver.cpp
+@@ -108,7 +108,7 @@ do_pgr_one_to_one_dijkstra(
+ 
+       return;
+   } catch ( ... ) {
+-      log << "Caught unknown expection!\n";
++      log << "Caught unknown exception!\n";
+       *err_msg = strdup(log.str().c_str());
+       return;
+   }
+--- a/src/driving_distance/src/boost_interface_drivedist.cpp
++++ b/src/driving_distance/src/boost_interface_drivedist.cpp
+@@ -90,7 +90,7 @@ do_pgr_driving_many_to_dist(
+         return;
+ 
+     } catch ( ... ) {
+-        *err_msg = strdup("Caught unknown expection!");
++        *err_msg = strdup("Caught unknown exception!");
+         *ret_path = noResult(path_count, (*ret_path));
+         return;
+     }
+--- a/src/driving_distance/src/withPoints_dd_driver.cpp
++++ b/src/driving_distance/src/withPoints_dd_driver.cpp
+@@ -178,7 +178,7 @@ do_pgr_many_withPointsDD(
+         return 0;
+ 
+     } catch ( ... ) {
+-        *err_msg = strdup("Caught unknown expection!");
++        *err_msg = strdup("Caught unknown exception!");
+         return 1000;
+     }
+ 
+@@ -316,7 +316,7 @@ do_pgr_withPointsDD(
+ #endif
+         return 0;
+     } catch ( ... ) {
+-        log << "Caught unknown expection!\n";
++        log << "Caught unknown exception!\n";
+         *err_msg = strdup(log.str().c_str());
+     }
+     return 1000;
+--- a/src/ksp/src/ksp_driver.cpp
++++ b/src/ksp/src/ksp_driver.cpp
+@@ -102,7 +102,7 @@ int  do_pgr_ksp(
+ #endif
+         return EXIT_SUCCESS;
+     } catch ( ... ) {
+-        *err_msg = strdup("Caught unknown expection!");
++        *err_msg = strdup("Caught unknown exception!");
+         return -1;
+     }
+ }
+--- a/src/ksp/src/withPoints_ksp_driver.cpp
++++ b/src/ksp/src/withPoints_ksp_driver.cpp
+@@ -166,7 +166,7 @@ do_pgr_withPointsKsp(
+ #endif
+         return 0;
+     } catch ( ... ) {
+-        log << "Caught unknown expection!\n";
++        log << "Caught unknown exception!\n";
+         *err_msg = strdup(log.str().c_str());
+     }
+     return 1000;
+--- a/src/withPoints/src/many_to_many_withPoints_driver.cpp
++++ b/src/withPoints/src/many_to_many_withPoints_driver.cpp
+@@ -201,7 +201,7 @@ do_pgr_many_to_many_withPoints(
+ #endif
+         return 0;
+     } catch ( ... ) {
+-        log << "Caught unknown expection!\n";
++        log << "Caught unknown exception!\n";
+         *err_msg = strdup(log.str().c_str());
+         return 1000;
+     }
+--- a/src/withPoints/src/many_to_one_withPoints_driver.cpp
++++ b/src/withPoints/src/many_to_one_withPoints_driver.cpp
+@@ -164,7 +164,7 @@ do_pgr_many_to_one_withPoints(
+ #endif
+         return 0;
+     } catch ( ... ) {
+-        log << "Caught unknown expection!\n";
++        log << "Caught unknown exception!\n";
+         *err_msg = strdup(log.str().c_str());
+         return 1000;
+     }
+--- a/src/withPoints/src/one_to_many_withPoints_driver.cpp
++++ b/src/withPoints/src/one_to_many_withPoints_driver.cpp
+@@ -189,7 +189,7 @@ do_pgr_one_to_many_withPoints(
+ #endif
+         return 0;
+     } catch ( ... ) {
+-        log << "Caught unknown expection!\n";
++        log << "Caught unknown exception!\n";
+         *err_msg = strdup(log.str().c_str());
+         return 1000;
+     }
+--- a/src/withPoints/src/one_to_one_withPoints_driver.cpp
++++ b/src/withPoints/src/one_to_one_withPoints_driver.cpp
+@@ -169,7 +169,7 @@ do_pgr_withPoints(
+ #endif
+         return 0;
+     } catch ( ... ) {
+-        log << "Caught unknown expection!\n";
++        log << "Caught unknown exception!\n";
+         *err_msg = strdup(log.str().c_str());
+     }
+     return 1000;
+--- a/tools/template/src/function1_driver.cpp
++++ b/tools/template/src/function1_driver.cpp
+@@ -123,7 +123,7 @@ do_pgr_MY_FUNCTION_NAME(
+         *err_msg = strdup(log.str().c_str());
+ #endif
+     } catch ( ... ) {
+-        log << "Caught unknown expection!\n";
++        log << "Caught unknown exception!\n";
+         *err_msg = strdup(log.str().c_str());
+     }
+ }
diff --git a/debian/patches/series b/debian/patches/series
index 1a4adf4..97f32d4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 privacy-breach-uses-embedded-file.patch
+exception-typo.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/pgrouting.git



More information about the Pkg-grass-devel mailing list