Merge branch 'SLE-15-SP1' into merge_SLE-15-SP1

yast · Sep 20, 2019 · dd70c09 · dd70c09
2 parents 708a16d + dfc69a9
commit dd70c09
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 10 deletions.
diff --git a/package/yast2-dns-server.changes b/package/yast2-dns-server.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Sep 20 14:12:10 UTC 2019 - Knut Anderssen <kanderssen@suse.com>
+
+- Do not modify the service when finishing the wizard dialog as
+  the configuration has not been written yet. (bsc#1123985)
+- 4.2.3
+
 -------------------------------------------------------------------
 Thu Aug 22 11:42:15 CEST 2019 - schubi@suse.de
 

diff --git a/package/yast2-dns-server.spec b/package/yast2-dns-server.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-dns-server
-Version:        4.2.2
+Version:        4.2.3
 Release:        0
 Url:            https://github.com/yast/yast-dns-server
 Summary:        YaST2 - DNS Server Configuration

diff --git a/src/include/dns-server/dialog-installwizard.rb b/src/include/dns-server/dialog-installwizard.rb
@@ -28,14 +28,6 @@ def initialize_dns_server_dialog_installwizard(include_target)
       Yast.import "CWMFirewallInterfaces"
     end
 
-    # Writes settings and saves the service
-    #
-    # @return [Boolean] true if service is saved successfully; false otherwise
-    def write_dns_settings
-      service_widget.store
-      service.save
-    end
-
     def runInstallWizardForwardersDialog
       caption =
         # Dialog caption (before a colon)
@@ -261,7 +253,7 @@ def runInstallWizardFinishDialog
       end
 
       if ret == :next || ret == :expert
-        write_dns_settings
+        service_widget.store
 
         CWMFirewallInterfaces.OpenFirewallStore(firewall_widget, "", event)
       end