[Debian-ha-svn-commits] [SCM] cluster suite Debian packaging branch, master, updated. debian/3.0.6-1

Guido Günther agx at sigxcpu.org
Sun Dec 27 14:08:59 UTC 2009


The following commit has been merged in the master branch:
commit 08a23fa494808861ddc984f5890eb973271fc807
Author: Guido Günther <agx at sigxcpu.org>
Date:   Wed Nov 25 22:28:21 2009 +0100

    Do nothing if cman_tool isn't there
    
    so we don't report an error if the package was removed but not purged.

diff --git a/debian/patches/0004-Do-nothing-if-cman_tool-isn-t-there.patch b/debian/patches/0004-Do-nothing-if-cman_tool-isn-t-there.patch
new file mode 100644
index 0000000..64aec43
--- /dev/null
+++ b/debian/patches/0004-Do-nothing-if-cman_tool-isn-t-there.patch
@@ -0,0 +1,23 @@
+From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx at sigxcpu.org>
+Date: Wed, 25 Nov 2009 22:26:55 +0100
+Subject: [PATCH] Do nothing if cman_tool isn't there
+
+so we don't report an error if the package was removed but not purged.
+---
+ cman/init.d/cman.in |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/cman/init.d/cman.in b/cman/init.d/cman.in
+index c6e7730..c4ae579 100644
+--- a/cman/init.d/cman.in
++++ b/cman/init.d/cman.in
+@@ -19,6 +19,8 @@
+ # set secure PATH
+ PATH="/bin:/usr/bin:/sbin:/usr/sbin:@SBINDIR@"
+ 
++test -x @SBINDIR@/cman_tool || exit 0
++
+ local_chkconfig()
+ {
+ 	ls /etc/rc${2}.d/S*${3} > /dev/null 2>/dev/null
+-- 
diff --git a/debian/patches/series b/debian/patches/series
index 885d6cf..f19386d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 0001-add-dlm-kernel-headers.patch
 0002-Fix-Default-Start-Stop-for-dependency-based-boot.patch
 0003-add-LD_LIBRARY_PATH-so-we-find-liblogthread.patch
+0004-Do-nothing-if-cman_tool-isn-t-there.patch

-- 
cluster suite Debian packaging



More information about the Debian-ha-svn-commits mailing list