public inbox for cluster-cvs@sourceware.org help / color / mirror / Atom feed
From: fabbione@sourceware.org To: cluster-cvs@sources.redhat.com, cluster-devel@redhat.com Subject: Cluster Project branch, master, updated. cluster-2.99.06-25-ge5831d2 Date: Thu, 17 Jul 2008 13:33:00 -0000 [thread overview] Message-ID: <20080717133307.11674.qmail@sourceware.org> (raw) 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
reply other threads:[~2008-07-17 13:33 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20080717133307.11674.qmail@sourceware.org \ --to=fabbione@sourceware.org \ --cc=cluster-cvs@sources.redhat.com \ --cc=cluster-devel@redhat.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).