cluster: STABLE3 - cman: Allow <cman upgrading="yes"/>

Christine Caulfield chrissie at fedoraproject.org
Thu Oct 1 09:58:39 UTC 2009


Gitweb:        http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=df5dc41a7eb1440f1f947785ebd86b1b464ee586
Commit:        df5dc41a7eb1440f1f947785ebd86b1b464ee586
Parent:        f1c1fa3445fe4646904a41d0f370697d25f8dc70
Author:        Christine Caulfield <ccaulfie at redhat.com>
AuthorDate:    Thu Oct 1 10:57:22 2009 +0100
Committer:     Christine Caulfield <ccaulfie at redhat.com>
CommitterDate: Thu Oct 1 10:57:22 2009 +0100

cman: Allow <cman upgrading="yes"/>

I think "yes" is more prevalent than "on" to enable things like debug logging
so I've allowed "yes" as well as "on" in the upgrading key.

We should only document one of these of course. But this, at least, saves
me time.

Signed-off-by: Christine Caulfield <ccaulfie at redhat.com>
---
 cman/daemon/cman-preconfig.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/cman/daemon/cman-preconfig.c b/cman/daemon/cman-preconfig.c
index aece9a5..b39ca4c 100644
--- a/cman/daemon/cman-preconfig.c
+++ b/cman/daemon/cman-preconfig.c
@@ -1272,7 +1272,7 @@ static int cmanpre_readconfig(struct objdb_iface_ver0 *objdb, const char **error
 
 	/* Set up STABLE2/RHEL5 compatibility modes */
 	objdb_get_string(objdb, object_handle, "upgrading", &str);
-	if (str && strcasecmp(str, "on")==0) {
+	if (str && (strcasecmp(str, "on")==0 || strcasecmp(str, "yes")==0)) {
 		setup_old_compat(objdb, cluster_parent_handle);
 	}
 


More information about the cluster-commits mailing list