From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 10717 invoked by alias); 9 Mar 2009 17:02:42 -0000 Received: (qmail 10672 invoked by alias); 9 Mar 2009 17:02:41 -0000 X-SWARE-Spam-Status: No, hits=-1.8 required=5.0 tests=AWL,BAYES_00,SPF_HELO_PASS X-Spam-Status: No, hits=-1.8 required=5.0 tests=AWL,BAYES_00,SPF_HELO_PASS X-Spam-Check-By: sourceware.org X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on bastion.fedora.phx.redhat.com Subject: cluster: STABLE3 - fence: Make fence agent metadata valid XML To: cluster-cvs-relay@redhat.com X-Project: Cluster Project X-Git-Module: cluster.git X-Git-Refname: refs/heads/STABLE3 X-Git-Reftype: branch X-Git-Oldrev: 6d79b0bbb45ad167e75aae57ab2b0a4fe90fb514 X-Git-Newrev: f2c67b07b3ef399c276adf1b9bf7c2b81769bc61 From: Lon Hohberger Message-Id: <20090309170213.D263A120289@lists.fedorahosted.org> Date: Mon, 09 Mar 2009 17:02:00 -0000 X-Scanned-By: MIMEDefang 2.58 on 172.16.52.254 Mailing-List: contact cluster-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: cluster-cvs-owner@sourceware.org X-SW-Source: 2009-q1/txt/msg00725.txt.bz2 Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=f2c67b07b3ef399c276adf1b9bf7c2b81769bc61 Commit: f2c67b07b3ef399c276adf1b9bf7c2b81769bc61 Parent: 6d79b0bbb45ad167e75aae57ab2b0a4fe90fb514 Author: Lon Hohberger AuthorDate: Mon Mar 9 12:58:00 2009 -0400 Committer: Lon Hohberger CommitterDate: Mon Mar 9 13:01:42 2009 -0400 fence: Make fence agent metadata valid XML This is needed by XSLT programs to transform the metadata to other formats (i.e. man pages, RelaxNG blobs, etc.) --- fence/agents/lib/fencing.py.py | 3 +++ fence/agents/xvm/options.c | 3 +++ 2 files changed, 6 insertions(+), 0 deletions(-) diff --git a/fence/agents/lib/fencing.py.py b/fence/agents/lib/fencing.py.py index bdf7da2..c6a5a33 100644 --- a/fence/agents/lib/fencing.py.py +++ b/fence/agents/lib/fencing.py.py @@ -329,6 +329,8 @@ def metadata(avail_opt): sorted_list = [ (key, all_opt[key]) for key in avail_opt ] sorted_list.sort(lambda x, y: cmp(x[1]["order"], y[1]["order"])) + print "" + print "" print "" for option, value in sorted_list: if all_opt[option].has_key("shortdesc"): @@ -345,6 +347,7 @@ def metadata(avail_opt): print "\t\t" + all_opt[option]["shortdesc"] + "" print "\t" print "" + print "" def process_input(avail_opt): global all_opt diff --git a/fence/agents/xvm/options.c b/fence/agents/xvm/options.c index 1d04cb6..5dd6781 100644 --- a/fence/agents/xvm/options.c +++ b/fence/agents/xvm/options.c @@ -537,6 +537,8 @@ args_metadata(char *progname, char *optstr) int x; struct arg_info *arg; + printf("\n"); + printf("\n", basename(progname)); printf("\n"); for (x = 0; x < strlen(optstr); x++) { @@ -554,6 +556,7 @@ args_metadata(char *progname, char *optstr) } printf("\n"); + printf("\n"); }