Cluster Project branch, master, updated. cluster-2.99.06-25-ge5831d2

Cluster Project branch, master, updated. cluster-2.99.06-25-ge5831d2

[fabbione]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Cluster Project".

http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=e5831d26703e03d4c98fa38ab066ab6c14a5948b

The branch, master has been updated
       via  e5831d26703e03d4c98fa38ab066ab6c14a5948b (commit)
       via  fb6ba10c0f02de9727e493b2d9de9a593d499a28 (commit)
      from  8ff7d32e3a8bfc9d27aa96c733d1011ddf7969ed (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit e5831d26703e03d4c98fa38ab066ab6c14a5948b
Author: Fabio M. Di Nitto <fdinitto@redhat.com>
Date:   Thu Jul 17 15:32:28 2008 +0200

    [RGMANAGER] Port ccs_get to proper ccs_tool output
    
    Signed-off-by: Fabio M. Di Nitto <fdinitto@redhat.com>

commit fb6ba10c0f02de9727e493b2d9de9a593d499a28
Author: Fabio M. Di Nitto <fdinitto@redhat.com>
Date:   Thu Jul 17 15:30:06 2008 +0200

    Revert "[RGMANAGER] Use proper ccs_tool query output"
    
    This reverts commit 2eaca4f9e31409f110ae318d1f192673dd744e33.

-----------------------------------------------------------------------

Summary of changes:
 rgmanager/src/resources/smb.sh                   |   11 ++++++++---
 rgmanager/src/resources/utils/config-utils.sh.in |   11 ++++++++---
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/rgmanager/src/resources/smb.sh b/rgmanager/src/resources/smb.sh
index 8131743..af81f05 100644
--- a/rgmanager/src/resources/smb.sh
+++ b/rgmanager/src/resources/smb.sh
@@ -112,10 +112,15 @@ ccs_get()
 
 	key="$*"
 
-	outp=$(ccs_tool query  "$key" 2>&1)
+	outp=$(ccs_tool query -c "$key" 2>&1)
 	if [ $? -ne 0 ]; then
-		ocf_log err "$outp ($key)"
-		return $_FAIL
+		if [ "$outp" = "${outp/No data available/}" ] || [ "$outp" = "${outp/Operation not permitted/}" ]; then
+			ocf_log err "$outp ($key)"
+			return $_FAIL
+		fi
+
+		# no real error, just no data available
+		return 0
 	fi
 
 	echo $outp
diff --git a/rgmanager/src/resources/utils/config-utils.sh.in b/rgmanager/src/resources/utils/config-utils.sh.in
index c3a92f2..03d4cf8 100644
--- a/rgmanager/src/resources/utils/config-utils.sh.in
+++ b/rgmanager/src/resources/utils/config-utils.sh.in
@@ -58,10 +58,15 @@ ccs_get()
 
 	key="$*"
 
-	outp=$(ccs_tool query "$key" 2>&1)
+	outp=$(ccs_tool query -c "$key" 2>&1)
 	if [ $? -ne 0 ]; then
-		ocf_log err "$outp ($key)"
-		return $FAIL
+		if [ "$outp" = "${outp/No data available/}" ] || [ "$outp" = "${outp/Operation not permitted/}" ]; then
+			ocf_log err "$outp ($key)"
+			return $FAIL
+		fi
+
+		# no real error, just no data available
+		return 0
 	fi
 
 	echo $outp


hooks/post-receive
--
Cluster Project