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

[Manuel Traut]

On Tue, Apr 17, 2018 at 12:46:56PM +0200, Torben Hohn wrote:
> 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>
Reviewed-by: Manuel Traut <manut at linutronix.de>

i'll pick it for 2.x and 3.x

> ---
>  schema/dbsfed.xsd | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/schema/dbsfed.xsd b/schema/dbsfed.xsd
> index 74eb732e..1dc86c67 100644
> --- a/schema/dbsfed.xsd
> +++ b/schema/dbsfed.xsd
> @@ -1647,7 +1647,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)
> @@ -1810,7 +1810,7 @@
>        </documentation>
>      </annotation>
>      <simpleContent>
> -      <extension base="string">
> +      <extension base="rfs:string">
>          <attribute name="exclude" type="string" use="optional" />
>        </extension>
>      </simpleContent>
> -- 
> 2.11.0
> 
> 
> _______________________________________________
> elbe-devel mailing list
> elbe-devel at linutronix.de
> https://lists.linutronix.de/mailman/listinfo/elbe-devel