render / rpms / libvirt

Forked from rpms/libvirt 10 months ago
Clone
Blob Blame History Raw
From c5384b4113cee0f343c782a01b9717fc04991e1a Mon Sep 17 00:00:00 2001
Message-Id: <c5384b4113cee0f343c782a01b9717fc04991e1a@dist-git>
From: Martin Kletzander <mkletzan@redhat.com>
Date: Wed, 26 Feb 2014 14:54:17 +0100
Subject: [PATCH] build: Don't fail on '&lt; ' or '&gt; ' with old xmllint

https://bugzilla.redhat.com/show_bug.cgi?id=1032370

Older xmllint version don't allow such characters in datatype anyURI.
In order not to change too much, I'm suggesting making a choice of
anyURI or 'absPathName' which should be fine (checked with upstream
and that old xmllint, both work fine).

Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
(cherry picked from commit d96b08bb240fecc89c96e31ddada59fd04ee9574)
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
---
 docs/schemas/storagevol.rng | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/docs/schemas/storagevol.rng b/docs/schemas/storagevol.rng
index 8bc5907..5da8e1f 100644
--- a/docs/schemas/storagevol.rng
+++ b/docs/schemas/storagevol.rng
@@ -105,7 +105,10 @@
     <element name='target'>
       <optional>
         <element name='path'>
-          <data type='anyURI'/>
+          <choice>
+            <data type='anyURI'/>
+            <ref name='absFilePath'/>
+          </choice>
         </element>
       </optional>
       <ref name='format'/>
-- 
1.9.0