Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package yast2-cluster for openSUSE:Factory 
checked in at 2021-07-02 13:28:02
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-cluster (Old)
 and      /work/SRC/openSUSE:Factory/.yast2-cluster.new.2625 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "yast2-cluster"

Fri Jul  2 13:28:02 2021 rev:46 rq:903658 version:4.4.1

Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-cluster/yast2-cluster.changes      
2021-05-01 00:47:10.331325449 +0200
+++ /work/SRC/openSUSE:Factory/.yast2-cluster.new.2625/yast2-cluster.changes    
2021-07-02 13:29:08.199983335 +0200
@@ -1,0 +2,7 @@
+Thu Jun 10 06:43:10 UTC 2021 - nick wang <nw...@suse.com>
+
+- bsc#1187157, add "none" for "crypto_hash" and "crypto_cipher"
+- Add "select" type checker
+- Version 4.4.1
+
+-------------------------------------------------------------------

Old:
----
  yast2-cluster-4.4.0.tar.bz2

New:
----
  yast2-cluster-4.4.1.tar.bz2

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

Other differences:
------------------
++++++ yast2-cluster.spec ++++++
--- /var/tmp/diff_new_pack.kw1QYZ/_old  2021-07-02 13:29:08.603980201 +0200
+++ /var/tmp/diff_new_pack.kw1QYZ/_new  2021-07-02 13:29:08.607980170 +0200
@@ -19,7 +19,7 @@
 %define _fwdefdir %{_prefix}/lib/firewalld/services
 
 Name:           yast2-cluster
-Version:        4.4.0
+Version:        4.4.1
 Release:        0
 Summary:        Configuration of cluster
 License:        GPL-2.0-only

++++++ yast2-cluster-4.4.0.tar.bz2 -> yast2-cluster-4.4.1.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yast2-cluster-4.4.0/package/yast2-cluster.changes 
new/yast2-cluster-4.4.1/package/yast2-cluster.changes
--- old/yast2-cluster-4.4.0/package/yast2-cluster.changes       2021-04-30 
18:14:12.000000000 +0200
+++ new/yast2-cluster-4.4.1/package/yast2-cluster.changes       2021-07-02 
11:07:44.000000000 +0200
@@ -1,4 +1,11 @@
 -------------------------------------------------------------------
+Thu Jun 10 06:43:10 UTC 2021 - nick wang <nw...@suse.com>
+
+- bsc#1187157, add "none" for "crypto_hash" and "crypto_cipher"
+- Add "select" type checker
+- Version 4.4.1
+
+-------------------------------------------------------------------
 Tue Apr 20 13:51:55 UTC 2021 - Ladislav Slez??k <lsle...@suse.cz>
 
 - 4.4.0 (bsc#1185510)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yast2-cluster-4.4.0/package/yast2-cluster.spec 
new/yast2-cluster-4.4.1/package/yast2-cluster.spec
--- old/yast2-cluster-4.4.0/package/yast2-cluster.spec  2021-04-30 
18:14:12.000000000 +0200
+++ new/yast2-cluster-4.4.1/package/yast2-cluster.spec  2021-07-02 
11:07:44.000000000 +0200
@@ -18,7 +18,7 @@
 %define _fwdefdir %{_prefix}/lib/firewalld/services
 
 Name:           yast2-cluster
-Version:        4.4.0
+Version:        4.4.1
 Release:        0
 Summary:        Configuration of cluster
 License:        GPL-2.0-only
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yast2-cluster-4.4.0/src/include/cluster/dialogs.rb 
new/yast2-cluster-4.4.1/src/include/cluster/dialogs.rb
--- old/yast2-cluster-4.4.0/src/include/cluster/dialogs.rb      2021-04-30 
18:14:12.000000000 +0200
+++ new/yast2-cluster-4.4.1/src/include/cluster/dialogs.rb      2021-07-02 
11:07:44.000000000 +0200
@@ -1102,12 +1102,12 @@
               HSpacing(20),
               Left(ComboBox(
                 Id(:crypto_hash), Opt(:hstretch, :notify), _("Crypto Hash:"),
-                ["sha1", "sha256", "sha384", "sha512", "md5"]
+                ["sha1", "sha256", "sha384", "sha512", "md5", "none"]
               )),
               HSpacing(5),
               Left(ComboBox(
                 Id(:crypto_cipher), Opt(:hstretch, :notify), _("Crypto 
Cipher:"),
-                ["aes256", "aes192", "aes128", "3des"]
+                ["aes256", "aes192", "aes128", "3des", "none"]
               )),
               HSpacing(20),
             ),
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yast2-cluster-4.4.0/src/servers_non_y2/ag_openais 
new/yast2-cluster-4.4.1/src/servers_non_y2/ag_openais
--- old/yast2-cluster-4.4.0/src/servers_non_y2/ag_openais       2021-04-30 
18:14:12.000000000 +0200
+++ new/yast2-cluster-4.4.1/src/servers_non_y2/ag_openais       2021-07-02 
11:07:44.000000000 +0200
@@ -40,7 +40,8 @@
 
 #the option table is used to parse and write suggested_value if no options are 
read
 
-#type is used for verification of values. "string", "int" and "dict"
+#type is used for verification of values. "string", "int", "select" and "dict"
+#"select" is a list of valid values
 #"dict" is for store the flexible key:value pair of a section. eg. 
quorum.device.heuristics.executables
 #       store in "other"(executables) dict, so doList(Dir) need to query the 
dict(executables)
 
@@ -56,10 +57,10 @@
                   "default_value":2,
                   "suggested_value":2},
        "crypto_cipher":{"doc":"Used for mutual node authentication",
-               "type":"select[aes256, aes192, aes128 and 
3des,none]","default_value":"none",
+               "type":"select[aes256, aes192, aes128, 3des, 
none]","default_value":"aes256",
                },
        "crypto_hash":{"doc":"Used for mutual node authentication",
-               
"type":"select[none,md5,sha1,sha256,sha384,sha512]","default_value":"none",
+               "type":"select[none, md5, sha1, sha256, sha384, 
sha512]","default_value":"sha1",
                },
        "clear_node_high_bit":{"doc":"To make sure the auto-generated nodeid is 
positive",
                               "default_value":"yes"},
@@ -493,13 +494,23 @@
                        others[opt[0]] = opt[1]
 
                else:
-                       #Available types: "string", "int".
+                       #Available types: "string", "int" and "select".
                        if options[opt[0]].get("type", "string") == "int":
                                try:
                                        result[opt[0]] = int(opt[1])
                                except ValueError:
                                        #y2warning("Invalid option %s found, 
default to %s" % (opt[0], options[opt[0]]["default_value"]))
                                        result[opt[0]] = 
options[opt[0]]["default_value"]
+                       elif options[opt[0]].get("type", 
"string").startswith("select["):
+                               tmpstr = options[opt[0]].get("type", 
"string").lstrip('select[').rstrip(']')
+                               vlist = tmpstr.split(',')
+
+                               for v in vlist:
+                                       if opt[1] == v.strip():
+                                               result[opt[0]] = opt[1]
+                                               break
+                               else:
+                                       result[opt[0]] = 
options[opt[0]]["default_value"]
                        else:
                                result[opt[0]] = opt[1]
 

Reply via email to