Merge b3c6651 into e4dcb5f

yast · Mar 23, 2020 · df8c50c · df8c50c
2 parents e4dcb5f + b3c6651
commit df8c50c
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 5 deletions.
diff --git a/package/yast2-ntp-client.changes b/package/yast2-ntp-client.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Mar 23 14:19:10 CET 2020 - schubi@suse.de
+
+- Do not write ntp-servers if they have been shown only (more than
+  one ntp-server) (follow up of bsc#1164547).
+- 4.1.12
+
 -------------------------------------------------------------------
 Wed Mar 18 15:44:25 CET 2020 - schubi@suse.de
 

diff --git a/package/yast2-ntp-client.spec b/package/yast2-ntp-client.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-ntp-client
-Version:        4.1.11
+Version:        4.1.12
 Release:        0
 Summary:        YaST2 - NTP Client Configuration
 License:        GPL-2.0-or-later

diff --git a/src/clients/ntp-client_proposal.rb b/src/clients/ntp-client_proposal.rb
@@ -321,10 +321,13 @@ def AskUser
     def WriteNtpSettings(ntp_servers, ntp_server, run_service)
       ntp_servers = deep_copy(ntp_servers)
       NtpClient.modified = true
-      NtpClient.ntp_conf.clear_pools
-      ntp_servers << ntp_server if ntp_servers.empty?
-      ntp_servers.each do |server|
-        NtpClient.ntp_conf.add_pool(server)
+      if select_ntp_server
+        # The user has changed the ntp-server(s). So we are writing them.
+        NtpClient.ntp_conf.clear_pools
+        ntp_servers << ntp_server if ntp_servers.empty?
+        ntp_servers.each do |server|
+          NtpClient.ntp_conf.add_pool(server)
+        end
       end
       if run_service
         NtpClient.run_service = true