From commits-return-7263-archive-asf-public=cust-asf.ponee.io@kudu.apache.org Thu Apr 11 01:16:42 2019 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [207.244.88.153]) by mx-eu-01.ponee.io (Postfix) with SMTP id D6156180626 for ; Thu, 11 Apr 2019 03:16:41 +0200 (CEST) Received: (qmail 24445 invoked by uid 500); 11 Apr 2019 01:16:41 -0000 Mailing-List: contact commits-help@kudu.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@kudu.apache.org Delivered-To: mailing list commits@kudu.apache.org Received: (qmail 24404 invoked by uid 99); 11 Apr 2019 01:16:41 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 11 Apr 2019 01:16:41 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 2405280D93; Thu, 11 Apr 2019 01:16:41 +0000 (UTC) Date: Thu, 11 Apr 2019 01:16:41 +0000 To: "commits@kudu.apache.org" Subject: [kudu] branch branch-1.9.x updated: tools: escape brackets when generating XML MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <155494540109.21667.6280167292143161544@gitbox.apache.org> From: alexey@apache.org X-Git-Host: gitbox.apache.org X-Git-Repo: kudu X-Git-Refname: refs/heads/branch-1.9.x X-Git-Reftype: branch X-Git-Oldrev: 51bdfcc97f8ed88c2f8ff1ab78a4b0d85cd5857e X-Git-Newrev: 6a9cf41cc16760398f0c6de8a670fc58f4978b84 X-Git-Rev: 6a9cf41cc16760398f0c6de8a670fc58f4978b84 X-Git-NotificationType: ref_changed_plus_diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated This is an automated email from the ASF dual-hosted git repository. alexey pushed a commit to branch branch-1.9.x in repository https://gitbox.apache.org/repos/asf/kudu.git The following commit(s) were added to refs/heads/branch-1.9.x by this push: new 6a9cf41 tools: escape brackets when generating XML 6a9cf41 is described below commit 6a9cf41cc16760398f0c6de8a670fc58f4978b84 Author: Andrew Wong AuthorDate: Tue Apr 9 17:25:33 2019 -0700 tools: escape brackets when generating XML When building the site, we generate the XML for tools. Usually we escape ambiguous characters for tooling arguments; it seems that wasn't the case for arguments that are GFlags. This meant that before, we would run into errors like the following when generating the site (new in 1.9.0 for the --predicates argument of the new `table scan` tool): /kudu/build/release/gen-docs/kudu.xml:49: parser error : StartTag: invalid element name * The 'Comparison' type supports <=, <, =, >, and >=, ^ Change-Id: I16c13d86b0b452e0559e245ee33373078e5e3713 Reviewed-on: http://gerrit.cloudera.org:8080/12981 Reviewed-by: Adar Dembo Reviewed-by: Grant Henke Tested-by: Andrew Wong (cherry picked from commit 4eb74ae233fadf5184632f4b291b0befeb371dd5) Reviewed-on: http://gerrit.cloudera.org:8080/12988 Tested-by: Kudu Jenkins --- src/kudu/tools/tool_action.cc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/kudu/tools/tool_action.cc b/src/kudu/tools/tool_action.cc index 54291ba..5ed62fd 100644 --- a/src/kudu/tools/tool_action.cc +++ b/src/kudu/tools/tool_action.cc @@ -381,10 +381,11 @@ string Action::BuildHelpXML(const vector& chain) const { xml += ""; xml += "optional"; xml += Substitute("$0", gflag_info.name); - xml += Substitute("$0", gflag_info.description); + xml += Substitute("$0", + EscapeForHtmlToString(gflag_info.description)); xml += Substitute("$0", gflag_info.type); xml += Substitute("$0", - gflag_info.default_value); + EscapeForHtmlToString(gflag_info.default_value)); xml += ""; } xml += Substitute("$0", EscapeForHtmlToString(usage));