Merge pull request #719 from yast/bsc-1176834-map

bsc#1176834: allow setting the config:type for upgrade/backup
yast · Oct 13, 2020 · 8e3eab3 · 8e3eab3
2 parents b56d582 + 349aed3
commit 8e3eab3
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 5 deletions.
diff --git a/package/autoyast2.changes b/package/autoyast2.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Oct 13 10:06:05 UTC 2020 - Imobach Gonzalez Sosa <igonzalezsosa@suse.com>
+
+- Allow setting the 't' (or 'config:type') attribute in the
+  'backup' and 'upgrade' elements (bsc#1176834 and bsc#1176848).
+- 4.3.61
+
 -------------------------------------------------------------------
 Thu Oct  8 15:31:12 UTC 2020 - Imobach Gonzalez Sosa <igonzalezsosa@suse.com>
 

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

diff --git a/src/autoyast-rnc/backup.rnc b/src/autoyast-rnc/backup.rnc
@@ -4,7 +4,10 @@ namespace a = "http://relaxng.org/ns/compatibility/annotations/1.0"
 
 backup =
   element backup {
-    element modified { BOOLEAN }? &
-    element remove_old { BOOLEAN }? &
-    element sysconfig { BOOLEAN }?
+    MAP,
+    (
+      element modified { BOOLEAN }? &
+      element remove_old { BOOLEAN }? &
+      element sysconfig { BOOLEAN }?
+    )
 }
diff --git a/src/autoyast-rnc/upgrade.rnc b/src/autoyast-rnc/upgrade.rnc
@@ -4,5 +4,8 @@ namespace a = "http://relaxng.org/ns/compatibility/annotations/1.0"
 
 upgrade =
   element upgrade {
-    element stop_on_solver_conflict { BOOLEAN }?
+    MAP,
+    (
+      element stop_on_solver_conflict { BOOLEAN }?
+    )
 }