Cluster Project branch, master, updated. cluster-2.99.06-21-g2eaca4f

[fabbione@sourceware.org]

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=2eaca4f9e31409f110ae318d1f192673dd744e33

The branch, master has been updated
       via  2eaca4f9e31409f110ae318d1f192673dd744e33 (commit)
      from  f4bcfa1d8e73f7402545dc60ab8affe96c1b01c8 (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 2eaca4f9e31409f110ae318d1f192673dd744e33
Author: Fabio M. Di Nitto <fdinitto@redhat.com>
Date:   Thu Jul 17 14:29:14 2008 +0200

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

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

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

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


hooks/post-receive
--
Cluster Project