From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-876608-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
	by finch.gentoo.org (Postfix) with ESMTP id 00B2059CB2
	for <garchives@archives.gentoo.org>; Sat, 16 Apr 2016 17:27:39 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 1011221C041;
	Sat, 16 Apr 2016 17:27:38 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by pigeon.gentoo.org (Postfix) with ESMTPS id A841D21C041
	for <gentoo-commits@lists.gentoo.org>; Sat, 16 Apr 2016 17:27:37 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id B9E77340BFD
	for <gentoo-commits@lists.gentoo.org>; Sat, 16 Apr 2016 17:27:33 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id 3D8DBC7
	for <gentoo-commits@lists.gentoo.org>; Sat, 16 Apr 2016 17:27:31 +0000 (UTC)
From: "Michał Górny" <mgorny@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" <mgorny@gentoo.org>
Message-ID: <1460827628.9de0e83fb8bc56c8e2db187e6bc66dc85cce9afa.mgorny@gentoo>
Subject: [gentoo-commits] data/xml-schema:master commit in: /
X-VCS-Repository: data/xml-schema
X-VCS-Files: metadata.xsd
X-VCS-Directories: /
X-VCS-Committer: mgorny
X-VCS-Committer-Name: Michał Górny
X-VCS-Revision: 9de0e83fb8bc56c8e2db187e6bc66dc85cce9afa
X-VCS-Branch: master
Date: Sat, 16 Apr 2016 17:27:31 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: b9bfeb02-cebc-4699-8369-215bc9897c67
X-Archives-Hash: 1a7eafb3e8175200f05d89155048b7a5

commit:     9de0e83fb8bc56c8e2db187e6bc66dc85cce9afa
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 16 17:27:08 2016 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Apr 16 17:27:08 2016 +0000
URL:        https://gitweb.gentoo.org/data/xml-schema.git/commit/?id=9de0e83f

metadata: Use more portable fake-attr uniquity constraint for subslots

 metadata.xsd | 35 ++++++++++++++++-------------------
 1 file changed, 16 insertions(+), 19 deletions(-)

diff --git a/metadata.xsd b/metadata.xsd
index 493c930..0ead09e 100644
--- a/metadata.xsd
+++ b/metadata.xsd
@@ -51,6 +51,10 @@
 					<xs:selector xpath='slot'/>
 					<xs:field xpath='@name'/>
 				</xs:unique>
+				<xs:unique name='subslotsSingleConstraint'>
+					<xs:selector xpath='subslots'/>
+					<xs:field xpath='@fake-only-once'/>
+				</xs:unique>
 			</xs:element>
 			<xs:element name='upstream' type='upstreamType'>
 				<xs:unique name='bugsToSingleConstraint'>
@@ -175,25 +179,9 @@
 
 	<!-- slots -->
 	<xs:complexType name='slotsType'>
-		<!-- the crazy magic below is to cover any order possible
-			 in a deterministic way -->
-		<xs:choice>
-			<xs:sequence>
-				<xs:element name='slot' type='slotType'
-					minOccurs='1' maxOccurs='unbounded'/>
-				<xs:sequence minOccurs='0' maxOccurs='1'>
-					<xs:element name='subslots' type='xs:token'
-						minOccurs='1' maxOccurs='1'/>
-					<xs:element name='slot' type='slotType'
-						minOccurs='0' maxOccurs='unbounded'/>
-				</xs:sequence>
-			</xs:sequence>
-			<xs:sequence>
-				<xs:element name='subslots' type='xs:token'
-					minOccurs='1' maxOccurs='1'/>
-				<xs:element name='slot' type='slotType'
-					minOccurs='0' maxOccurs='unbounded'/>
-			</xs:sequence>
+		<xs:choice minOccurs='0' maxOccurs='unbounded'>
+			<xs:element name='slot' type='slotType'/>
+			<xs:element name='subslots' type='tokenOnceType'/>
 		</xs:choice>
 		<xs:attribute name='lang' type='langAttrType' default='en'/>
 	</xs:complexType>
@@ -532,6 +520,15 @@
 		</xs:restriction>
 	</xs:simpleType>
 
+	<xs:complexType name='tokenOnceType'>
+		<xs:simpleContent>
+			<xs:extension base="xs:token">
+				<xs:attribute name='fake-only-once'
+					fixed='there can be at most one element of this type'/>
+			</xs:extension>
+		</xs:simpleContent>
+	</xs:complexType>
+
 	<xs:simpleType name='urlType'>
 		<xs:restriction base='xs:token'>
 			<!-- TODO: something better? -->