[osmosis] 01/01: Add patch to fix negative exit status in replicate_osm_file.sh.

[Bas Couwenberg]

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

sebastic-guest pushed a commit to branch master
in repository osmosis.

commit 9027862759693ee69a1ba608e46649521ac8a22e
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sat Dec 6 16:00:44 2014 +0100

    Add patch to fix negative exit status in replicate_osm_file.sh.
---
 debian/changelog                |  2 ++
 debian/patches/07-bashism.patch | 24 ++++++++++++++++++++++++
 debian/patches/series           |  1 +
 3 files changed, 27 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index d2ac090..0849b7b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ osmosis (0.43.1-3) UNRELEASED; urgency=medium
     githubredir service.
   * Bump Standards-Version to 3.9.6, no changes.
   * Add upstream metadata.
+  * Add patch to fix negative exit status in replicate_osm_file.sh.
+    (closes: #772355)
 
  -- Bas Couwenberg <sebastic at xs4all.nl>  Fri, 03 Oct 2014 23:38:53 +0200
 
diff --git a/debian/patches/07-bashism.patch b/debian/patches/07-bashism.patch
new file mode 100644
index 0000000..a77e257
--- /dev/null
+++ b/debian/patches/07-bashism.patch
@@ -0,0 +1,24 @@
+Description: Don't exit with negative status, statuses fall between 0 and 255.
+ Exit using the osmosis status in case it fails instead of -1.
+Author: Bas Couwenberg <sebastic at xs4all.nl>
+Bug-Debian: https://bugs.debian.org/772355
+Forwarded: https://github.com/openstreetmap/osmosis/pull/15
+
+--- a/package/script/contrib/replicate_osm_file.sh
++++ b/package/script/contrib/replicate_osm_file.sh
+@@ -23,11 +23,13 @@ CMD="osmosis -q"
+ # Launch the osmosis process.
+ $CMD --read-change-interval $WORKING_DIRECTORY --read-xml $OSM_FILE --apply-change --bounding-box left=$LEFT bottom=$BOTTOM right=$RIGHT top=$TOP --write-xml $TEMP_OSM_FILE
+ 
++STATUS=$?
++
+ # Verify that osmosis ran successfully.
+-if [ "$?" -ne "0" ]; then
++if [ "$STATUS" -ne "0" ]; then
+ 	
+ 	echo "Osmosis failed, aborting."
+-	exit -1
++	exit $STATUS
+ 	
+ fi
+ 
diff --git a/debian/patches/series b/debian/patches/series
index ac571d9..9db3e6a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,6 +4,7 @@
 04-osmosis-version.patch
 05-protobuf-2.6.0.patch
 06-java-7.patch
+07-bashism.patch
 0001-Modify-the-pgsnapshot-load-script-to-more-sensible-d.patch
 0001-Use-ALTER-TABLE-.-CLUSTER-ON-statements-to-set-what-.patch
 0001-Disable-synchronous_commit-for-pgsnapshot-loading.patch

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