Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package yast2-drbd for openSUSE:Factory
checked in at 2023-04-13 14:11:27
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-drbd (Old)
and /work/SRC/openSUSE:Factory/.yast2-drbd.new.19717 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-drbd"
Thu Apr 13 14:11:27 2023 rev:40 rq:1079105 version:4.6.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-drbd/yast2-drbd.changes 2023-03-03
22:31:59.960182747 +0100
+++ /work/SRC/openSUSE:Factory/.yast2-drbd.new.19717/yast2-drbd.changes
2023-04-13 14:11:31.648565269 +0200
@@ -1,0 +2,6 @@
+Mon Apr 12 15:40:31 UTC 2023 - Xin Liang <xli...@suse.com>
+
+- Validate DRBD Device name (bsc#1207952)
+- 4.6.1
+
+-------------------------------------------------------------------
Old:
----
yast2-drbd-4.6.0.tar.bz2
New:
----
yast2-drbd-4.6.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-drbd.spec ++++++
--- /var/tmp/diff_new_pack.lIg67P/_old 2023-04-13 14:11:32.172568278 +0200
+++ /var/tmp/diff_new_pack.lIg67P/_new 2023-04-13 14:11:32.176568301 +0200
@@ -18,7 +18,7 @@
%define _fwdefdir %{_prefix}/lib/firewalld/services
Name: yast2-drbd
-Version: 4.6.0
+Version: 4.6.1
Release: 0
Summary: YaST2 - DRBD Configuration
License: GPL-2.0-or-later
++++++ yast2-drbd-4.6.0.tar.bz2 -> yast2-drbd-4.6.1.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-drbd-4.6.0/package/yast2-drbd.changes
new/yast2-drbd-4.6.1/package/yast2-drbd.changes
--- old/yast2-drbd-4.6.0/package/yast2-drbd.changes 2023-03-03
15:51:36.000000000 +0100
+++ new/yast2-drbd-4.6.1/package/yast2-drbd.changes 2023-04-13
11:56:00.000000000 +0200
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Mon Apr 12 15:40:31 UTC 2023 - Xin Liang <xli...@suse.com>
+
+- Validate DRBD Device name (bsc#1207952)
+- 4.6.1
+
+-------------------------------------------------------------------
Fri Mar 03 14:44:07 UTC 2023 - Ladislav Slezák <lsle...@suse.cz>
- Bump version to 4.6.0 (bsc#1208913)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-drbd-4.6.0/package/yast2-drbd.spec
new/yast2-drbd-4.6.1/package/yast2-drbd.spec
--- old/yast2-drbd-4.6.0/package/yast2-drbd.spec 2023-03-03
15:51:36.000000000 +0100
+++ new/yast2-drbd-4.6.1/package/yast2-drbd.spec 2023-04-13
11:56:00.000000000 +0200
@@ -18,7 +18,7 @@
%define _fwdefdir %{_prefix}/lib/firewalld/services
Name: yast2-drbd
-Version: 4.6.0
+Version: 4.6.1
Release: 0
Summary: YaST2 - DRBD Configuration
License: GPL-2.0-or-later
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-drbd-4.6.0/src/include/drbd/resource_conf.rb
new/yast2-drbd-4.6.1/src/include/drbd/resource_conf.rb
--- old/yast2-drbd-4.6.0/src/include/drbd/resource_conf.rb 2023-03-03
15:51:36.000000000 +0100
+++ new/yast2-drbd-4.6.1/src/include/drbd/resource_conf.rb 2023-04-13
11:56:00.000000000 +0200
@@ -609,6 +609,16 @@
deep_copy(res_config)
end
+ def ValidDeviceName
+ dev_name = UI.QueryWidget(Id(:n_devc), :Value).to_s
+ if ! (dev_name =~ /(\/dev\/|)(drbd0|drbd[1-9][0-9]*)$/)
+ Popup.Warning(_("Valid \"Device\" value should be:\n\
+- /dev/drbd0\n- /dev/drbd[1-9][0-9]*\n- drbd0\n- drbd[1-9][0-9]*"))
+ return false
+ end
+ true
+ end
+
def ValidIPaddress
addressField = Convert.to_string(UI.QueryWidget(Id(:n_addr), :Value))
@@ -742,6 +752,12 @@
invalid = true
ret = nil
next
+ end
+
+ if ! ValidDeviceName()
+ invalid = true
+ ret = nil
+ next
end
if ret == :ok
