Merge pull request #1 from adaugherity/files_cleanup

schema fixes for <files>
yast · Aug 13, 2012 · 6038ee0 · 6038ee0
2 parents 50e92b2 + 2efd879
commit 6038ee0
Showing 1 changed file with 5 additions and 7 deletions.
diff --git a/src/schema/files.rnc b/src/schema/files.rnc
@@ -4,18 +4,16 @@ default namespace = "http://www.suse.com/1.0/yast2ns"
 namespace config = "http://www.suse.com/1.0/configns"
 namespace a = "http://relaxng.org/ns/compatibility/annotations/1.0"
 
-y2_files =
-  file_contents
-  | file_path
-  | file_permissions
-  | file_owner
-  | file_script
+file_src = file_contents
+  | file_location
 files =
   element files {
     LIST,
-    element file { y2_files* }+
+    element file { file_src? & file_path & file_permissions?
+	& file_owner? & file_script? }+
   }
 file_contents = element file_contents { text }
+file_location = element file_location { text }
 file_path = element file_path { text }
 file_permissions = element file_permissions { text }
 file_owner = element file_owner { text }