cluster: RHEL6 - rgmanager: Fix rg_test exit status on failures

Ryan McCabe rmccabe at fedoraproject.org
Mon Jun 23 01:14:57 UTC 2014


Gitweb:        http://git.fedorahosted.org/git/?p=cluster.git;a=commitdiff;h=6fbf7b593dbd48245fee4411935abb03ba063183
Commit:        6fbf7b593dbd48245fee4411935abb03ba063183
Parent:        c4aaef4d08c0e886fbba70a0abf4cdc1ce241a27
Author:        Ryan McCabe <rmccabe at redhat.com>
AuthorDate:    Mon Jun 16 10:55:15 2014 -0400
Committer:     Ryan McCabe <rmccabe at redhat.com>
CommitterDate: Sun Jun 22 21:12:42 2014 -0400

rgmanager: Fix rg_test exit status on failures

Exit with a non-zero exit code on all failure paths when running
rg_test.

Resolves: rhbz#1033162

Signed-off-by: Ryan McCabe <rmccabe at redhat.com>
---
 rgmanager/src/daemons/test.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/rgmanager/src/daemons/test.c b/rgmanager/src/daemons/test.c
index 1982995..e74a8c1 100644
--- a/rgmanager/src/daemons/test.c
+++ b/rgmanager/src/daemons/test.c
@@ -128,6 +128,7 @@ test_func(int argc, char **argv)
 	conf_setconfig(argv[1]);
        	ccsfd = ccs_lock();
 	if (ccsfd < 0) {
+		ret = -1;
 		printf("Error parsing %s\n", argv[1]);
 		goto out;
 	}
@@ -430,6 +431,7 @@ main(int argc, char **argv)
 		} else {
 			ret = stat(argv[1], &st);
 			if (ret == -1 || !S_ISDIR(st.st_mode)) {
+				ret = -1;
 				break;
 			}
 			fprintf(stderr,


More information about the cluster-commits mailing list