cluster: STABLE3 - cman_tool: make it the authoritative tool to enable a new configuration

Fabio M. Di Nitto fabbione at fedoraproject.org
Fri Dec 11 08:04:29 UTC 2009


Gitweb:        http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=2e5967a3b52a53eedb36887604fb063c0e9fec01
Commit:        2e5967a3b52a53eedb36887604fb063c0e9fec01
Parent:        ded81a77973a752c3c4af5a6cca306df4cfb7cc7
Author:        Fabio M. Di Nitto <fdinitto at redhat.com>
AuthorDate:    Fri Dec 11 09:03:19 2009 +0100
Committer:     Fabio M. Di Nitto <fdinitto at redhat.com>
CommitterDate: Fri Dec 11 09:03:19 2009 +0100

cman_tool: make it the authoritative tool to enable a new configuration

rhbz: #545801

Signed-off-by: Fabio M. Di Nitto <fdinitto at redhat.com>
---
 cman/cman_tool/main.c |   13 ++++++-------
 1 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/cman/cman_tool/main.c b/cman/cman_tool/main.c
index 3d38e86..d8b08dd 100644
--- a/cman/cman_tool/main.c
+++ b/cman/cman_tool/main.c
@@ -777,15 +777,14 @@ static void version(commandline_t *comline)
 		if (result)
 			die("ccs_sync failed.\nIf you have distributed the config file yourself, try re-running with -S\n");
 	}
-	else {
-		if (comline->verbose)
-			printf("Telling cman the new version number\n");
 
-		ver.cv_config = comline->config_version;
+	if (comline->verbose)
+		printf("Telling cman the new version number\n");
 
-		if ((result = cman_set_version(h, &ver)))
-			die("can't set version: %s", cman_error(errno));
-	}
+	ver.cv_config = comline->config_version;
+
+	if ((result = cman_set_version(h, &ver)))
+		die("can't set version: %s", cman_error(errno));
  out:
 	cman_finish(h);
 }


More information about the cluster-commits mailing list