[libmongodb-perl] 02/03: Further fixes for mongod test suite interaction

[dom at earth.li]

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

dom pushed a commit to branch master
in repository libmongodb-perl.

commit b15b7c328fbafaa8bc9247493ea4e51eb15991b9
Author: Dominic Hargreaves <dom at earth.li>
Date:   Tue Aug 13 21:39:45 2013 +0200

    Further fixes for mongod test suite interaction
---
 debian/changelog |   10 ++++++++++
 debian/rules     |    5 ++++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 5f2423f..051f597 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+libmongodb-perl (0.700.0-2) UNRELEASED; urgency=low
+
+  * Only depend on mongod on i386 and amd64 (the only architectures the
+    test suite is available on). Patch from Niko Tyni (Closes: #719593)
+  * Ignore failures to stop the test mongod process, since it may have
+    not started up successfully if mongod was started from an init script
+    (see: #719641)
+
+ -- Dominic Hargreaves <dom at earth.li>  Tue, 13 Aug 2013 21:28:11 +0200
+
 libmongodb-perl (0.700.0-1) unstable; urgency=low
 
   [ Harlan Lieberman-Berg ]
diff --git a/debian/rules b/debian/rules
index f9f980f..77dd737 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,7 +13,10 @@ override_dh_auto_test:
 	  sleep 10; \
 	fi
 	dh_auto_test
-	[ ! -s $(PIDFILE) ] || /bin/kill `cat $(PIDFILE)`
+	# The server process might not have actually started, since
+	# the system one will already be running unless policy-rc.d
+	# prevented it
+	[ ! -s $(PIDFILE) ] || /bin/kill `cat $(PIDFILE)` || true
 
 override_dh_clean:
 	dh_clean

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libmongodb-perl.git