Fix UI lable switch to turn off csync2 service

bsc#1175648, unable to turn off csync2 service. Fix the incorrect return number when firewalld enabled.
yast · Aug 25, 2020 · 2934889 · 2934889
1 parent ea69539
commit 2934889
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/package/yast2-cluster.changes b/package/yast2-cluster.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Aug 25 01:18:40 UTC 2020 - nick wang <nwang@suse.com>
+
+- bsc#1175648, fix UI lable switch to turn off csync2 service
+- Version 4.0.12
+
 -------------------------------------------------------------------
 Mon Apr 13 06:49:43 UTC 2020 - nick wang <nwang@suse.com>
 

diff --git a/package/yast2-cluster.spec b/package/yast2-cluster.spec
@@ -18,7 +18,7 @@
 
 %define _fwdefdir %{_libexecdir}/firewalld/services
 Name:           yast2-cluster
-Version:        4.0.11
+Version:        4.0.12
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build

diff --git a/src/include/cluster/dialogs.rb b/src/include/cluster/dialogs.rb
@@ -1477,10 +1477,11 @@ def csync2_status
         firewalld_cluster = firewalld.find_service("cluster")
         tcp_ports = firewalld_cluster.tcp_ports
       rescue Y2Firewall::Firewalld::Service::NotFound
-        tcp_ports = []
+        y2debug("Firewalld service not found.")
+        return 3
       end
 
-      tcp_ports.include?(@csync2_port) ? 2 : 3
+      tcp_ports.include?(@csync2_port) ? 3 : 2
     end
 
     def csync2_turn_off