Merge 892a407 into 9f1e850

yast · Jul 2, 2020 · 1e87420 · 1e87420
2 parents 9f1e850 + 892a407
commit 1e87420
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 6 deletions.
diff --git a/package/autoyast2.changes b/package/autoyast2.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Jul  2 15:18:39 UTC 2020 - Knut Anderssen <kanderssen@suse.com>
+
+- Make the report section elements optional as AutoYaST proposes
+  default values when missing (bsc#1173312)
+- 4.3.20
+
 -------------------------------------------------------------------
 Thu Jul 02 11:53:44 UTC 2020 - Knut Anderssen <kanderssen@suse.com>
 

diff --git a/package/autoyast2.spec b/package/autoyast2.spec
@@ -22,7 +22,7 @@
 %endif
 
 Name:           autoyast2
-Version:        4.3.19
+Version:        4.3.20
 Release:        0
 Summary:        YaST2 - Automated Installation
 License:        GPL-2.0-only

diff --git a/src/autoyast-rnc/reporting.rnc b/src/autoyast-rnc/reporting.rnc
@@ -6,11 +6,11 @@ namespace config = "http://www.suse.com/1.0/configns"
 
 include "common.rnc"
 
-report = element report { MAP, (errors & messages & warnings & yesno_messages?) }
-errors = element errors { MAP, (log & show & timeout) }
-yesno_messages = element yesno_messages { MAP, (log & show & timeout) }
-messages = element messages { MAP, (log & show & timeout) }
-warnings = element warnings { MAP, (log & show & timeout) }
+report = element report { MAP, (errors? & messages? & warnings? & yesno_messages?) }
+errors = element errors { MAP, (log? & show? & timeout?) }
+yesno_messages = element yesno_messages { MAP, (log? & show? & timeout?) }
+messages = element messages { MAP, (log? & show? & timeout?) }
+warnings = element warnings { MAP, (log? & show? & timeout?) }
 # <!ELEMENT location (#PCDATA)>
 log =
   element log { BOOLEAN }