Merge pull request #118 from yast/merge_SLE-15-GA

Merge SLE-15-GA into master
yast · Oct 4, 2018 · 1590787 · 1590787
2 parents 6ef7128 + 9d47df8
commit 1590787
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/package/yast2-ntp-client.changes b/package/yast2-ntp-client.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Oct  3 14:11:34 UTC 2018 - knut.anderssen@suse.com
+
+- AutoYaST: Do not show the progress when merging the configuration
+  before writing it (bsc#1110598)
+- 4.1.2
+
 -------------------------------------------------------------------
 Fri Sep  7 15:20:26 UTC 2018 - dgonzalez@suse.com
 

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.1
+Version:        4.1.2
 Release:        0
 Summary:        YaST2 - NTP Client Configuration
 License:        GPL-2.0-or-later

diff --git a/src/lib/y2ntp_client/client/auto.rb b/src/lib/y2ntp_client/client/auto.rb
@@ -39,9 +39,9 @@ def change
       end
 
       def write
+        progress_orig = Yast::Progress.set(false)
         # ensure to merge config to system chrony configuration to do minimal configuration
         Yast::NtpClient.merge_to_system
-        progress_orig = Yast::Progress.set(false)
         Yast::NtpClient.write_only = true
         ret = Yast::NtpClient.Write
         Yast::Progress.set(progress_orig)