From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 12445 invoked by alias); 3 Sep 2009 13:49:32 -0000 Received: (qmail 12438 invoked by alias); 3 Sep 2009 13:49:32 -0000 X-SWARE-Spam-Status: No, hits=-1.9 required=5.0 tests=AWL,BAYES_00,SPF_HELO_PASS X-Spam-Status: No, hits=-1.9 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 bastion2.fedora.phx.redhat.com Subject: cluster: STABLE3 - config validation: improve shell wrapper 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: 8a7f5a96f6838df9b862f741559dc58d0675adc2 X-Git-Newrev: 11c12ef0b705e15b0b6af4728a3ffd8f4e1ea50a From: "Fabio M. Di Nitto" Message-Id: <20090903134901.387501201A8@lists.fedorahosted.org> Date: Thu, 03 Sep 2009 13:49:00 -0000 X-Scanned-By: MIMEDefang 2.67 on 10.5.11.16 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-q3/txt/msg00292.txt.bz2 Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=11c12ef0b705e15b0b6af4728a3ffd8f4e1ea50a Commit: 11c12ef0b705e15b0b6af4728a3ffd8f4e1ea50a Parent: 8a7f5a96f6838df9b862f741559dc58d0675adc2 Author: Fabio M. Di Nitto AuthorDate: Thu Sep 3 15:48:11 2009 +0200 Committer: Fabio M. Di Nitto CommitterDate: Thu Sep 3 15:48:11 2009 +0200 config validation: improve shell wrapper add more error checking across the path and make ccs_config_validate error unique vs xmlling. Signed-off-by: Fabio M. Di Nitto --- config/tools/xml/ccs_config_validate.in | 24 ++++++++++++++++++++---- 1 files changed, 20 insertions(+), 4 deletions(-) diff --git a/config/tools/xml/ccs_config_validate.in b/config/tools/xml/ccs_config_validate.in index 6891cd4..5c09a3e 100644 --- a/config/tools/xml/ccs_config_validate.in +++ b/config/tools/xml/ccs_config_validate.in @@ -17,7 +17,23 @@ fi [ -z "$CONFIG_LOADER" ] && CONFIG_LOADER=xmlconfig export COROSYNC_DEFAULT_CONFIG_IFACE=$CONFIG_LOADER:cmanpreconfig -ccs_config_dump | xmllint \ - --relaxng @SHAREDIR@/cluster.rng \ - - >/dev/null -exit $? +tempfile=$(mktemp) + +if [ -z "$tempfile" ]; then + echo "Unable to create temp file" + exit 255 +fi + +if ! ccs_config_dump > $tempfile; then + rm -f $tempfile + echo "Unable to get the configuration" + exit 255 +fi + +xmllint \ + --relaxng @SHAREDIR@/cluster.rng \ + $tempfile >/dev/null +res=$? + +rm -f $tempfile +exit $res