diff options
author | Repository QA checks <repo-qa-checks@gentoo.org> | 2016-05-06 20:03:14 +0000 |
---|---|---|
committer | Repository QA checks <repo-qa-checks@gentoo.org> | 2016-05-06 20:03:14 +0000 |
commit | 4229940387fb556e9d1e91c09fa518ec6d5ded62 (patch) | |
tree | 39f762d39434562ecaed863a59915ae1742011d1 | |
parent | 2016-05-06 17:23:53 UTC (diff) | |
parent | metadata: Fix allowing multiple <description/>s on maintainers (diff) | |
download | gentoo-4229940387fb556e9d1e91c09fa518ec6d5ded62.tar.gz gentoo-4229940387fb556e9d1e91c09fa518ec6d5ded62.tar.bz2 gentoo-4229940387fb556e9d1e91c09fa518ec6d5ded62.zip |
Merge commit '6070512ca8d633167fdcb976e386df7b834b7f61'
-rw-r--r-- | metadata/xml-schema/metadata.xsd | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/metadata/xml-schema/metadata.xsd b/metadata/xml-schema/metadata.xsd index fe2c5d2ad626..27039cd9b32c 100644 --- a/metadata/xml-schema/metadata.xsd +++ b/metadata/xml-schema/metadata.xsd @@ -41,6 +41,10 @@ <xs:choice minOccurs='0' maxOccurs='unbounded'> <xs:element name='longdescription' type='longDescType'/> <xs:element name='maintainer' type='maintainerType'> + <xs:unique name='maintainerNameSingleConstraint'> + <xs:selector xpath='name'/> + <xs:field xpath='@fake-only-once'/> + </xs:unique> <xs:unique name='maintainerDescUniquityConstraint'> <xs:selector xpath='description'/> <xs:field xpath='@lang'/> @@ -112,14 +116,11 @@ <!-- maintainer in two variants --> <xs:complexType name='maintainerType'> - <xs:all> - <xs:element name='email' type='emailType' - minOccurs='1'/> - <xs:element name='name' type='xs:token' - minOccurs='0'/> - <xs:element name='description' type='maintainerDescType' - minOccurs='0'/> - </xs:all> + <xs:choice minOccurs='0' maxOccurs='unbounded'> + <xs:element name='email' type='emailType'/> + <xs:element name='name' type='tokenOnceType'/> + <xs:element name='description' type='maintainerDescType'/> + </xs:choice> <xs:attribute name='type' type='maintainerTypeAttrType' use='required'/> <xs:attribute name='restrict' type='restrictAttrType'/> |