summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRepository QA checks <repo-qa-checks@gentoo.org>2016-05-08 05:43:18 +0000
committerRepository QA checks <repo-qa-checks@gentoo.org>2016-05-08 05:43:18 +0000
commit367cd3fb235942ce7a1235bfa8bd7f9f1c9b049f (patch)
tree1ff2d85e6e88c5f5340669d429bcab45131f06ab
parentMerge updates from master (diff)
parentmetadata.xsd: fix upstream maintainer name uniquity constraint (diff)
downloadgentoo-367cd3fb235942ce7a1235bfa8bd7f9f1c9b049f.tar.gz
gentoo-367cd3fb235942ce7a1235bfa8bd7f9f1c9b049f.tar.bz2
gentoo-367cd3fb235942ce7a1235bfa8bd7f9f1c9b049f.zip
Merge commit 'd7e18ac28cde6806f95f62705874f31e010a9e0e'
-rw-r--r--metadata/xml-schema/metadata.xsd13
1 files changed, 6 insertions, 7 deletions
diff --git a/metadata/xml-schema/metadata.xsd b/metadata/xml-schema/metadata.xsd
index 111e1ecfe323..cad830485bbc 100644
--- a/metadata/xml-schema/metadata.xsd
+++ b/metadata/xml-schema/metadata.xsd
@@ -61,6 +61,10 @@
</xs:unique>
</xs:element>
<xs:element name='upstream' type='upstreamType'>
+ <xs:unique name='upstreamMaintainerUniquityConstraint'>
+ <xs:selector xpath='maintainer'/>
+ <xs:field xpath='name'/>
+ </xs:unique>
<xs:unique name='bugsToSingleConstraint'>
<xs:selector xpath='bugs-to'/>
<xs:field xpath='@fake-only-once'/>
@@ -99,12 +103,7 @@
<!-- the huge <upstream/> structure -->
<xs:complexType name='upstreamType'>
<xs:choice minOccurs='0' maxOccurs='unbounded'>
- <xs:element name='maintainer' type='upstreamMaintainerType'>
- <xs:unique name='upstreamMaintainerUniquityConstraint'>
- <xs:selector xpath='maintainer'/>
- <xs:field xpath='name'/>
- </xs:unique>
- </xs:element>
+ <xs:element name='maintainer' type='upstreamMaintainerType'/>
<xs:element name='changelog' type='urlOnceType'/>
<xs:element name='doc' type='upstreamDocType'/>
<xs:element name='bugs-to' type='urlOnceType'/>
@@ -168,7 +167,7 @@
<xs:element name='cat' type='catType'/>
</xs:choice>
<xs:attribute name='lang' type='langAttrType' default='en'/>
- <xs:attribute name='restrict' type='restrictAttrType'/>
+ <xs:attribute name='restrict' type='restrictAttrType' default=''/>
</xs:complexType>
<xs:complexType name='catLongDescType' mixed='true'>