Mailinglist Archive: yast-commit (870 mails)

[ug@xxxxxxxxxxxxxxxx]

Author: ug
Date: Thu Jul  3 18:12:50 2008
New Revision: 48857

URL: http://svn.opensuse.org/viewcvs/yast?rev=48857&view=rev
Log:
minor fixes in RNC and XML definition

Modified:
    trunk/autoinstallation/src/include/xml.ycp
    trunk/autoinstallation/src/schema/general.rnc
    trunk/autoinstallation/src/schema/software.rnc

Modified: trunk/autoinstallation/src/include/xml.ycp
URL: 
http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/include/xml.ycp?rev=48857&r1=48856&r2=48857&view=diff
==============================================================================
--- trunk/autoinstallation/src/include/xml.ycp (original)
+++ trunk/autoinstallation/src/include/xml.ycp Thu Jul  3 18:12:50 2008
@@ -93,7 +93,8 @@
             "patterns":"pattern",
             "dont_merge":"element",
             "keys":"keyid",
-            "pathlist":"path"
+            "pathlist":"path",
+            "proposals":"proposal"
                 ];
 
             doc["cdataSections"] = ["source", "info_file", "file_contents", 
"pxelinux-config"];

Modified: trunk/autoinstallation/src/schema/general.rnc
URL: 
http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/schema/general.rnc?rev=48857&r1=48856&r2=48857&view=diff
==============================================================================
--- trunk/autoinstallation/src/schema/general.rnc (original)
+++ trunk/autoinstallation/src/schema/general.rnc Thu Jul  3 18:12:50 2008
@@ -2,7 +2,16 @@
 namespace config = "http://www.suse.com/1.0/configns";
 namespace a = "http://relaxng.org/ns/compatibility/annotations/1.0";
 
-general = element general { mode? & mouse? & ask-list? & signature-handling? }
+general = element general { 
+    mode? & 
+    mouse? & 
+    ask-list? & 
+    signature-handling? &
+    element proposals {
+        LIST,
+        element proposal { text }*
+    }?
+}
 ask-list = element ask-list { LIST, ask* }
 ask = element ask { ask_question? & ask_default? & ask_help? & ask_title? & 
ask_type? & ask_password? & ask_path? & ask_pathlist? & ask_stage? & 
ask_selection? & ask_file? & ask_dialog? & ask_element? & ask_frametitle? & 
ask_script? }
 ask_question = element question { text }

Modified: trunk/autoinstallation/src/schema/software.rnc
URL: 
http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/schema/software.rnc?rev=48857&r1=48856&r2=48857&view=diff
==============================================================================
--- trunk/autoinstallation/src/schema/software.rnc (original)
+++ trunk/autoinstallation/src/schema/software.rnc Thu Jul  3 18:12:50 2008
@@ -8,7 +8,8 @@
     packages? &
     post-packages? &
     remove-packages? &
-    patterns?
+    patterns? &
+    element do_online_update { BOOLEAN }?
   }
 patterns =
   element patterns {

--
To unsubscribe, e-mail: yast-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: yast-commit+help@xxxxxxxxxxxx