added pattern to repomd testsuite and RNC/RNG

diff --git a/devel/devel.jsrain/yum/YUMParser.test/repmod.xml b/devel/devel.jsrain/yum/YUMParser.test/repmod.xml
deleted file mode 120000 (symlink)
index cb7c727..0000000
--- a/devel/devel.jsrain/yum/YUMParser.test/repmod.xml
+++ /dev/null
@@ -1 +0,0 @@
-001-repomd-correct.test.xml
\ No newline at end of file

diff --git a/testsuite/parser/tests/yum-repomd-1.out b/testsuite/parser/tests/yum-repomd-1.out
index 3357d23..a02bf05 100644 (file)
--- a/testsuite/parser/tests/yum-repomd-1.out
+++ b/testsuite/parser/tests/yum-repomd-1.out
@@ -46,4 +46,12 @@ Repomd Data:
   timestamp: '1119534896'
   openChecksumType: 'sha'
   openChecksum: 'e8f9b1f8b3aa049ba3e3e813ee33e37302e9b16a'
+Repomd Data: 
+  type: 'pattern'
+  location: 'repodata/pattern.xml'
+  checksumType: 'sha'
+  checksum: '20f45621426fcd74364d6fabe6929d1164797801'
+  timestamp: '1119534896'
+  openChecksumType: 'sha'
+  openChecksum: 'e8f9b1f8b3aa049ba3e3e813ee33e37302e9b16a'
 Exit Code: 0

diff --git a/testsuite/parser/tests/yum-repomd-1.xml b/testsuite/parser/tests/yum-repomd-1.xml
index 99fb851..d856736 100644 (file)
--- a/testsuite/parser/tests/yum-repomd-1.xml
+++ b/testsuite/parser/tests/yum-repomd-1.xml
@@ -36,4 +36,10 @@
     <timestamp>1119534896</timestamp>
     <open-checksum type="sha">e8f9b1f8b3aa049ba3e3e813ee33e37302e9b16a</open-checksum>
   </data>
+  <data type="pattern">
+    <location href="repodata/pattern.xml"/>
+    <checksum type="sha">20f45621426fcd74364d6fabe6929d1164797801</checksum>
+    <timestamp>1119534896</timestamp>
+    <open-checksum type="sha">e8f9b1f8b3aa049ba3e3e813ee33e37302e9b16a</open-checksum>
+  </data>
 </repomd>

diff --git a/zypp/parser/yum/schema/repomd.rnc b/zypp/parser/yum/schema/repomd.rnc
index 2adde87..88a625f 100644 (file)
--- a/zypp/parser/yum/schema/repomd.rnc
+++ b/zypp/parser/yum/schema/repomd.rnc
@@ -2,7 +2,7 @@ default namespace = "http://linux.duke.edu/metadata/repo"
 
 element repomd {
   element data {
-    attribute type { "other" | "filelists" | "primary" | "group" | "product" | "patches" }&
+    attribute type { "other" | "filelists" | "primary" | "group" | "product" | "patches" | "pattern" }&
     element location {
       attribute xml:base { xsd:anyURI }?,
       attribute href { xsd:anyURI },

diff --git a/zypp/parser/yum/schema/repomd.rng b/zypp/parser/yum/schema/repomd.rng
index 1b39946..94e81dc 100644 (file)
--- a/zypp/parser/yum/schema/repomd.rng
+++ b/zypp/parser/yum/schema/repomd.rng
@@ -12,6 +12,7 @@
               <value>group</value>
               <value>product</value>
               <value>patches</value>
+              <value>pattern</value>
             </choice>
           </attribute>
           <element name="location">