From 275fecfe1205ed526c766d7e8de829e4c7950ae5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ladislav=20Slez=C3=A1k?= Date: Tue, 26 Mar 2019 12:57:17 +0100 Subject: [PATCH 1/3] adapt Rakefile and Dockerfile for SLE-15-SP1 --- Dockerfile | 2 +- Rakefile | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 3e6f6ed..5a3af4e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,3 +1,3 @@ -FROM yastdevel/ruby +FROM yastdevel/ruby:sle15-sp1 COPY . /usr/src/app diff --git a/Rakefile b/Rakefile index 927a322..f7f415b 100644 --- a/Rakefile +++ b/Rakefile @@ -1,5 +1,7 @@ require "yast/rake" +Yast::Tasks.submit_to :sle15sp1 + Yast::Tasks.configuration do |conf| #lets ignore license check for now conf.skip_license_check << /.*/ From 6882c43c9a5cf6883fd20c09ec5ad3dd18a9f0e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Knut=20Alejandro=20Anderssen=20Gonz=C3=A1lez?= Date: Fri, 20 Sep 2019 15:19:24 +0100 Subject: [PATCH 2/3] Do not save the service in the wizard finish dialog. --- src/include/dns-server/dialog-installwizard.rb | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/include/dns-server/dialog-installwizard.rb b/src/include/dns-server/dialog-installwizard.rb index 7d349ef..f679f36 100644 --- 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 From d2993069444fe70b6cce10b4d3ecb4d81cda9bba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Knut=20Alejandro=20Anderssen=20Gonz=C3=A1lez?= Date: Fri, 20 Sep 2019 15:19:39 +0100 Subject: [PATCH 3/3] Bump version & changelog. --- package/yast2-dns-server.changes | 7 +++++++ package/yast2-dns-server.spec | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/package/yast2-dns-server.changes b/package/yast2-dns-server.changes index f43712c..c858ed5 100644 --- 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 + +- Do not modify the service when finishing the wizard dialog as + the configuration has not been written yet. (bsc#1123985) +- 4.1.3 + ------------------------------------------------------------------- Sun Nov 25 02:10:40 UTC 2018 - Stasiek Michalski diff --git a/package/yast2-dns-server.spec b/package/yast2-dns-server.spec index 0dc4c27..e5d90d1 100644 --- a/package/yast2-dns-server.spec +++ b/package/yast2-dns-server.spec @@ -17,7 +17,7 @@ Name: yast2-dns-server -Version: 4.1.2 +Version: 4.1.3 Release: 0 Url: https://github.com/yast/yast-dns-server