[Debian-ha-svn-commits] [SCM] cluster suite Debian packaging branch, experimental, updated. debian/3.0.11-1-1-ga45231b

[Guido Günther]

The following commit has been merged in the experimental branch:
commit a45231bb4be083e804abf42918d655639548210d
Author: Guido Günther <agx at sigxcpu.org>
Date:   Thu May 13 12:57:21 2010 +0200

    New patch 0005-Remove-bashisms-from-resource-scripts.patch
    
    Remove bashisms from resource scripts
    
    Closes: #581137

diff --git a/debian/patches/0005-Remove-bashisms-from-resource-scripts.patch b/debian/patches/0005-Remove-bashisms-from-resource-scripts.patch
new file mode 100644
index 0000000..3079bb3
--- /dev/null
+++ b/debian/patches/0005-Remove-bashisms-from-resource-scripts.patch
@@ -0,0 +1,37 @@
+From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx at sigxcpu.org>
+Date: Thu, 13 May 2010 12:56:22 +0200
+Subject: [PATCH] Remove bashisms from resource scripts
+
+Closes: #581137
+---
+ rgmanager/src/resources/SAPDatabase |    2 +-
+ rgmanager/src/resources/SAPInstance |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/rgmanager/src/resources/SAPDatabase b/rgmanager/src/resources/SAPDatabase
+index 8ac3005..e1249b8 100644
+--- a/rgmanager/src/resources/SAPDatabase
++++ b/rgmanager/src/resources/SAPDatabase
+@@ -560,7 +560,7 @@ sapuserexit() {
+     if [ -x "$VALUE" ]
+     then
+       ocf_log info "Calling userexit ${NAME} with customer script file ${VALUE}"
+-      eval "$VALUE" >& /dev/null
++      eval "$VALUE" > /dev/null 2>&1
+       ocf_log info "Exiting userexit ${NAME} with customer script file ${VALUE}, returncode: $?"
+     else
+       ocf_log warn "Attribute ${NAME} is set to ${VALUE}, but this file is not executable"
+diff --git a/rgmanager/src/resources/SAPInstance b/rgmanager/src/resources/SAPInstance
+index 94643c9..a97aaf6 100644
+--- a/rgmanager/src/resources/SAPInstance
++++ b/rgmanager/src/resources/SAPInstance
+@@ -234,7 +234,7 @@ sapuserexit() {
+     if [ -x "$VALUE" ]
+     then
+       ocf_log info "Calling userexit ${NAME} with customer script file ${VALUE}"
+-      eval "$VALUE" >& /dev/null
++      eval "$VALUE" > /dev/null 2>&1
+       ocf_log info "Exiting userexit ${NAME} with customer script file ${VALUE}, returncode: $?"
+     else
+       ocf_log warn "Attribute ${NAME} is set to ${VALUE}, but this file is not executable"
+-- 
diff --git a/debian/patches/series b/debian/patches/series
index 698b683..a835b38 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
 0002-Fix-Default-Start-Stop-for-dependency-based-boot.patch
 0003-Don-t-rely-on-chkconfig-and-check-for-network-manage.patch
 0004-Depend-on-remote_fs.patch
+0005-Remove-bashisms-from-resource-scripts.patch

-- 
cluster suite Debian packaging