From 514e8f4bb75da4e75cd64c55697efe770427403d Mon Sep 17 00:00:00 2001
From: "Chris St. Pierre" <chris.a.st.pierre@gmail.com>
Date: Mon, 23 Jan 2012 13:53:03 -0500
Subject: fixed packages schema (reported by mattikus on IRC)

---
 schemas/packages.xsd | 22 +++++++---------------
 1 file changed, 7 insertions(+), 15 deletions(-)

(limited to 'schemas/packages.xsd')

diff --git a/schemas/packages.xsd b/schemas/packages.xsd
index 9f16a23c0..e09dcf8b5 100644
--- a/schemas/packages.xsd
+++ b/schemas/packages.xsd
@@ -12,25 +12,19 @@
       <xsd:enumeration value="yum"/>
       <xsd:enumeration value="apt"/>
       <xsd:enumeration value="pac"/>
-      <xsd:enumeration value="pulp"/>
     </xsd:restriction>
   </xsd:simpleType>
 
   <xsd:complexType name="sourceType">
-    <xsd:sequence minOccurs="0" maxOccurs="unbounded">
-      <xsd:element name="Component" type="xsd:string" minOccurs="0"
-                   maxOccurs="unbounded"/>
+    <xsd:choice minOccurs="0" maxOccurs="unbounded">
+      <xsd:element name="Component" type="xsd:string"/>
+      <xsd:element name="Arch" type="xsd:string"/>
+      <xsd:element name="GPGKey" type="xsd:string"/>
       <xsd:choice>
-        <xsd:element name="Blacklist" type="xsd:string" minOccurs="0"
-                     maxOccurs="unbounded"/>
-        <xsd:element name="Whitelist" type="xsd:string" minOccurs="0"
-                     maxOccurs="unbounded"/>
+        <xsd:element name="Blacklist" type="xsd:string"/>
+        <xsd:element name="Whitelist" type="xsd:string"/>
       </xsd:choice>
-      <xsd:element name="Arch" type="xsd:string" minOccurs="1"
-                   maxOccurs="unbounded"/>
-      <xsd:element name="GPGKey" type="xsd:string" minOccurs="0"
-                   maxOccurs="unbounded"/>
-    </xsd:sequence>
+    </xsd:choice>
     <xsd:attribute type="xsd:boolean" name="recommended"/>
     <xsd:attribute type="sourceTypeEnum" name="type"/>
     <xsd:attribute type="xsd:string" name="pulp_id"/>
@@ -51,14 +45,12 @@
   </xsd:complexType>
 
   <xsd:complexType name="sourcesType">
-    <xsd:sequence>
       <xsd:choice minOccurs="1" maxOccurs="unbounded">
         <xsd:element name="Group" type="groupType"/>
         <xsd:element name="Client" type="groupType"/>
         <xsd:element name="Source" type="sourceType"/>
         <xsd:element name="Sources" type="sourcesType"/>
       </xsd:choice>
-    </xsd:sequence>
   </xsd:complexType>
 
   <xsd:element name="Sources" type="sourcesType"/>
-- 
cgit v1.2.3-1-g7c22