[elbe-devel] [PATCH v2 07/10] dbsfed.xsd: reinstate rfs:rm type for <rm> in finetuning.

Torben Hohn torben.hohn at linutronix.de
Tue Apr 17 12:39:38 CEST 2018


due to a merge error in
e7bd6e7066c5 ("Merge branch 'bene' into devel/elbe-2.0")
the reference to the rfs:rm complextype which adds the
exclude parameter to the rm finetuning command got removed.

Using the exclude feature resulted in the following error:

----------------------------------------------------------------------------------
error Element 'rm', attribute 'exclude': The attribute 'exclude' is not allowed.
----------------------------------------------------------------------------------

This patch also changes string to rfs:string, because this has not been
changed by b216e05590f5 ("XML schema: allow XML base attribute")
which was on the other side of the merge.

Signed-off-by: Torben Hohn <torben.hohn at linutronix.de>
---
 schema/dbsfed.xsd | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/schema/dbsfed.xsd b/schema/dbsfed.xsd
index 232b5eb1..d87967de 100644
--- a/schema/dbsfed.xsd
+++ b/schema/dbsfed.xsd
@@ -1648,7 +1648,7 @@
           </documentation>
         </annotation>
       </element>
-      <element name="rm" type="rfs:string" minOccurs="0">
+      <element name="rm" type="rfs:rm" minOccurs="0">
         <annotation>
           <documentation>
             remove a file or directory (recursive)
@@ -1811,7 +1811,7 @@
       </documentation>
     </annotation>
     <simpleContent>
-      <extension base="string">
+      <extension base="rfs:string">
         <attribute name="exclude" type="string" use="optional" />
       </extension>
     </simpleContent>
-- 
2.11.0




More information about the elbe-devel mailing list