Hello community,

here is the log from the commit of package yast2-dhcp-server for 
openSUSE:Factory checked in at 2020-05-09 19:51:07
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-dhcp-server (Old)
 and      /work/SRC/openSUSE:Factory/.yast2-dhcp-server.new.2738 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "yast2-dhcp-server"

Sat May  9 19:51:07 2020 rev:60 rq:801311 version:4.3.0

Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-dhcp-server/yast2-dhcp-server.changes      
2020-04-10 23:53:14.256698126 +0200
+++ 
/work/SRC/openSUSE:Factory/.yast2-dhcp-server.new.2738/yast2-dhcp-server.changes
    2020-05-09 19:51:13.436692278 +0200
@@ -1,0 +2,7 @@
+Thu May  7 15:31:15 UTC 2020 - Josef Reidinger <jreidin...@suse.com>
+
+- Autoyast schema: Allow optional types for string and map objects
+  (bsc#1170886)
+- 4.3.0
+
+-------------------------------------------------------------------

Old:
----
  yast2-dhcp-server-4.2.3.tar.bz2

New:
----
  yast2-dhcp-server-4.3.0.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ yast2-dhcp-server.spec ++++++
--- /var/tmp/diff_new_pack.rpbOLa/_old  2020-05-09 19:51:14.792695188 +0200
+++ /var/tmp/diff_new_pack.rpbOLa/_new  2020-05-09 19:51:14.796695197 +0200
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-dhcp-server
-Version:        4.2.3
+Version:        4.3.0
 Release:        0
 Summary:        YaST2 - DHCP Server Configuration
 License:        GPL-2.0-only

++++++ yast2-dhcp-server-4.2.3.tar.bz2 -> yast2-dhcp-server-4.3.0.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/yast2-dhcp-server-4.2.3/package/yast2-dhcp-server.changes 
new/yast2-dhcp-server-4.3.0/package/yast2-dhcp-server.changes
--- old/yast2-dhcp-server-4.2.3/package/yast2-dhcp-server.changes       
2020-04-07 15:35:02.000000000 +0200
+++ new/yast2-dhcp-server-4.3.0/package/yast2-dhcp-server.changes       
2020-05-07 18:00:13.000000000 +0200
@@ -1,4 +1,11 @@
 -------------------------------------------------------------------
+Thu May  7 15:31:15 UTC 2020 - Josef Reidinger <jreidin...@suse.com>
+
+- Autoyast schema: Allow optional types for string and map objects
+  (bsc#1170886)
+- 4.3.0
+
+-------------------------------------------------------------------
 Sat Apr  4 17:06:50 UTC 2020 - Michal Filka <mfi...@suse.com>
 
 - bsc#1167474
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/yast2-dhcp-server-4.2.3/package/yast2-dhcp-server.spec 
new/yast2-dhcp-server-4.3.0/package/yast2-dhcp-server.spec
--- old/yast2-dhcp-server-4.2.3/package/yast2-dhcp-server.spec  2020-04-07 
15:35:02.000000000 +0200
+++ new/yast2-dhcp-server-4.3.0/package/yast2-dhcp-server.spec  2020-05-07 
18:00:13.000000000 +0200
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-dhcp-server
-Version:        4.2.3
+Version:        4.3.0
 Release:        0
 Summary:        YaST2 - DHCP Server Configuration
 Group:          System/YaST
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/yast2-dhcp-server-4.2.3/src/autoyast-rnc/dhcp-server.rnc 
new/yast2-dhcp-server-4.3.0/src/autoyast-rnc/dhcp-server.rnc
--- old/yast2-dhcp-server-4.2.3/src/autoyast-rnc/dhcp-server.rnc        
2020-04-07 15:35:02.000000000 +0200
+++ new/yast2-dhcp-server-4.3.0/src/autoyast-rnc/dhcp-server.rnc        
2020-05-07 18:00:13.000000000 +0200
@@ -2,14 +2,18 @@
 namespace a = "http://relaxng.org/ns/compatibility/annotations/1.0";
 namespace config = "http://www.suse.com/1.0/configns";
 
+include "common.rnc"
 
 dhcp-server = element dhcp-server {
-    allowed_interfaces? &
-    element chroot             { "1" | "0" }? &
-    element start_service      { "1" | "0" }? &
-    element use_ldap           { "1" | "0" }? &
-    element other_options      { text } &
-    dhcp-server-settings?
+    MAP,
+    (
+      allowed_interfaces? &
+      element chroot             { STRING_ATTR, ("1" | "0") }? &
+      element start_service      { STRING_ATTR, ("1" | "0") }? &
+      element use_ldap           { STRING_ATTR, ("1" | "0") }? &
+      element other_options      { STRING } &
+      dhcp-server-settings?
+    )
 }
 
 allowed_interfaces = 
@@ -18,7 +22,7 @@
     allowed_interface*
 }
 
-allowed_interface = element allowed_interface { text }
+allowed_interface = element allowed_interface { STRING }
 
 dhcp-server-settings = element settings {
     LIST,
@@ -26,15 +30,18 @@
 }
 
 dhcp-server-settings_entry = element settings_entry {
-    settings_entry_children? &
-    settings_entry_directives? &
+    MAP,
+    (
+      settings_entry_children? &
+      settings_entry_directives? &
 
 
-    element id          { text }? &
-    options?                     &
-    element parent_id   { text }? &
-    element parent_type { text }? &
-    element type        { text }? 
+      element id          { STRING }? &
+      options?                   &
+      element parent_id   { STRING }? &
+      element parent_type { STRING }? &
+      element type        { STRING }? 
+    )
 }
 
 settings_entry_children = element children {
@@ -43,8 +50,11 @@
 }
 
 settings_entry_child = element child {
-    element id   { text }? &
-    element type { text }?
+    MAP,
+    (
+      element id   { STRING }? &
+      element type { STRING }?
+    )
 }
 
 settings_entry_directives = element directives {
@@ -53,9 +63,12 @@
 }
 
 settings_entry_directives_listentry = element listentry {
-    element key   { text }? &
-    element type  { text }? &
-    element value { text }?
+    MAP,
+    (
+      element key   { STRING }? &
+      element type  { STRING }? &
+      element value { STRING }?
+    )
 }
 
 options = element options {
@@ -64,7 +77,10 @@
 }
 
 option = element option {
-    element key   { text }? &
-    element type  { text }? &
-    element value { text }?
+    MAP,
+    (
+      element key   { STRING }? &
+      element type  { STRING }? &
+      element value { STRING }?
+    )
 }


Reply via email to