From: Peter Krempa <pkrempa@redhat.com>
Date: Wed, 7 Oct 2020 14:19:42 +0000 (+0200)
Subject: schema: nwfiter: Allow leading/trailing whitespace in 'variable-name-type'
X-Git-Tag: v6.9.0-rc1~86
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6ecd479d0149249930c531c1566f87cfd69e7c3b;p=thirdparty%2Flibvirt.git

schema: nwfiter: Allow leading/trailing whitespace in 'variable-name-type'

The reference string parser tolerates some leading/trailing whitespace
for the reference strings as witnessed by
tests/nwfilterxml2xmlin/iter-test3.xml

Allow them in the schema so that the test passes schema validation.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
---

diff --git a/docs/schemas/nwfilter.rng b/docs/schemas/nwfilter.rng
index 64a607e62f..a75de7ed3e 100644
--- a/docs/schemas/nwfilter.rng
+++ b/docs/schemas/nwfilter.rng
@@ -725,7 +725,7 @@
 
   <define name="variable-name-type">
     <data type="string">
-      <param name="pattern">$[a-zA-Z0-9_]+(\[[ ]*[@]?[0-9]+[ ]*\])?</param>
+      <param name="pattern">$[ ]*[a-zA-Z0-9_]+(\[[ ]*[@]?[0-9]+[ ]*\])?[ ]*</param>
     </data>
   </define>