From fd92b580848414bd8785e1c4f3319b56c09d29ef Mon Sep 17 00:00:00 2001
From: Narayan Desai <desai@mcs.anl.gov>
Date: Thu, 17 Jun 2010 16:11:39 +0000
Subject: Tighten schema for package entries in Rules (Resolves root cause of
 #894)

git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@5945 ce84e21b-d406-0410-9b95-82705330c041
---
 schemas/rules.xsd | 44 +++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 43 insertions(+), 1 deletion(-)

diff --git a/schemas/rules.xsd b/schemas/rules.xsd
index a544f7a8f..207eb65e5 100644
--- a/schemas/rules.xsd
+++ b/schemas/rules.xsd
@@ -8,10 +8,52 @@
     </xsd:documentation>
   </xsd:annotation>
 
-  <xsd:include schemaLocation="pkgtype.xsd"/>
   <xsd:include schemaLocation="servicetype.xsd"/>
   <xsd:include schemaLocation="types.xsd"/>
 
+<xsd:complexType name='PackageType'>
+    <xsd:choice minOccurs='0' maxOccurs='unbounded'>
+      <xsd:element name='Ignore'>
+        <xsd:complexType>
+          <xsd:attribute type='xsd:string' name='name'/>
+        </xsd:complexType>
+      </xsd:element>
+      <xsd:element name='Instance'>
+        <xsd:complexType>
+          <xsd:choice minOccurs='0' maxOccurs='unbounded'>
+            <xsd:element name='Ignore'>
+              <xsd:complexType>
+                <xsd:attribute type='xsd:string' name='name'/>
+              </xsd:complexType>
+            </xsd:element>
+          </xsd:choice>
+          <xsd:attribute name='arch' type='xsd:string'/>
+          <xsd:attribute name='epoch' type='xsd:string'/>
+          <xsd:attribute name='version' type='xsd:string'/>
+          <xsd:attribute name='release' type='xsd:string'/>
+          <xsd:attribute name='simplefile' type='xsd:string'/>
+          <xsd:attribute name='pkg_verify' type='xsd:string'/>
+          <xsd:attribute name='verify_flags' type='xsd:string'/>
+          <xsd:attribute name='installed_action' type='xsd:string'/>
+          <xsd:attribute name='version_fail_action' type='xsd:string'/>
+          <xsd:attribute name='verify_fail_action' type='xsd:string'/>
+        </xsd:complexType>
+      </xsd:element>
+    </xsd:choice>
+    <xsd:attribute type='xsd:string' name='name' use='required'/>
+    <xsd:attribute type='xsd:string' name='version' use='required'/>
+    <xsd:attribute type='xsd:string' name='file'/>
+    <xsd:attribute type='xsd:string' name='verify'/>
+    <xsd:attribute type='xsd:string' name='simplefile'/>
+    <xsd:attribute type='xsd:string' name='reloc'/>
+    <xsd:attribute type='xsd:string' name='multiarch'/>
+    <xsd:attribute type='xsd:string' name='srcs'/>
+    <xsd:attribute type='xsd:string' name='type' use='required'/>
+    <xsd:attribute type='xsd:string' name='bname'/>
+    <xsd:attribute name='pkg_checks' type='xsd:string'/>
+    <xsd:attribute name='verify_flags' type='xsd:string'/>
+  </xsd:complexType>
+
   <xsd:complexType name='DirectoryType'>
     <xsd:attribute type='xsd:string' name='name' use='required'/>
     <xsd:attribute type='xsd:string' name='perms'/>
-- 
cgit v1.2.3-1-g7c22