Hello community,
here is the log from the commit of package yast2-dns-server for
openSUSE:Factory checked in at 2019-09-23 13:17:17
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-dns-server (Old)
and /work/SRC/openSUSE:Factory/.yast2-dns-server.new.7948 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-dns-server"
Mon Sep 23 13:17:17 2019 rev:80 rq:732623 version:4.2.4
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-dns-server/yast2-dns-server.changes
2019-08-27 10:13:03.611972840 +0200
+++
/work/SRC/openSUSE:Factory/.yast2-dns-server.new.7948/yast2-dns-server.changes
2019-09-23 13:17:18.865106060 +0200
@@ -1,0 +2,14 @@
+Mon Sep 23 07:12:04 UTC 2019 - Knut Anderssen <[email protected]>
+
+- Permit the user to force an netconfig update when netconfig was
+ not able to change the configuration. (bsc#1123985)
+- 4.2.4
+
+-------------------------------------------------------------------
+Fri Sep 20 14:12:10 UTC 2019 - Knut Anderssen <[email protected]>
+
+- Do not modify the service when finishing the wizard dialog as
+ the configuration has not been written yet. (bsc#1123985)
+- 4.2.3
+
+-------------------------------------------------------------------
Old:
----
yast2-dns-server-4.2.2.tar.bz2
New:
----
yast2-dns-server-4.2.4.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-dns-server.spec ++++++
--- /var/tmp/diff_new_pack.Dott2A/_old 2019-09-23 13:17:19.385105967 +0200
+++ /var/tmp/diff_new_pack.Dott2A/_new 2019-09-23 13:17:19.389105966 +0200
@@ -17,7 +17,7 @@
Name: yast2-dns-server
-Version: 4.2.2
+Version: 4.2.4
Release: 0
Url: https://github.com/yast/yast-dns-server
Summary: YaST2 - DNS Server Configuration
++++++ yast2-dns-server-4.2.2.tar.bz2 -> yast2-dns-server-4.2.4.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-dns-server-4.2.2/package/yast2-dns-server.changes
new/yast2-dns-server-4.2.4/package/yast2-dns-server.changes
--- old/yast2-dns-server-4.2.2/package/yast2-dns-server.changes 2019-08-22
12:29:41.000000000 +0200
+++ new/yast2-dns-server-4.2.4/package/yast2-dns-server.changes 2019-09-23
09:49:54.000000000 +0200
@@ -1,4 +1,18 @@
-------------------------------------------------------------------
+Mon Sep 23 07:12:04 UTC 2019 - Knut Anderssen <[email protected]>
+
+- Permit the user to force an netconfig update when netconfig was
+ not able to change the configuration. (bsc#1123985)
+- 4.2.4
+
+-------------------------------------------------------------------
+Fri Sep 20 14:12:10 UTC 2019 - Knut Anderssen <[email protected]>
+
+- 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 - [email protected]
- Using rb_default_ruby_abi tag in the spec file in order to
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-dns-server-4.2.2/package/yast2-dns-server.spec
new/yast2-dns-server-4.2.4/package/yast2-dns-server.spec
--- old/yast2-dns-server-4.2.2/package/yast2-dns-server.spec 2019-08-22
12:29:41.000000000 +0200
+++ new/yast2-dns-server-4.2.4/package/yast2-dns-server.spec 2019-09-23
09:49:54.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package yast2-dns-server
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
Name: yast2-dns-server
-Version: 4.2.2
+Version: 4.2.4
Release: 0
Url: https://github.com/yast/yast-dns-server
Summary: YaST2 - DNS Server Configuration
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-dns-server-4.2.2/src/include/dns-server/dialog-installwizard.rb
new/yast2-dns-server-4.2.4/src/include/dns-server/dialog-installwizard.rb
--- old/yast2-dns-server-4.2.2/src/include/dns-server/dialog-installwizard.rb
2019-08-22 12:29:41.000000000 +0200
+++ new/yast2-dns-server-4.2.4/src/include/dns-server/dialog-installwizard.rb
2019-09-23 09:49:54.000000000 +0200
@@ -28,14 +28,6 @@
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 @@
end
if ret == :next || ret == :expert
- write_dns_settings
+ service_widget.store
CWMFirewallInterfaces.OpenFirewallStore(firewall_widget, "", event)
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-dns-server-4.2.2/src/modules/DnsServer.pm
new/yast2-dns-server-4.2.4/src/modules/DnsServer.pm
--- old/yast2-dns-server-4.2.2/src/modules/DnsServer.pm 2019-08-22
12:29:41.000000000 +0200
+++ new/yast2-dns-server-4.2.4/src/modules/DnsServer.pm 2019-09-23
09:49:54.000000000 +0200
@@ -1260,6 +1260,20 @@
return \@ret;
}
+sub netconfig_update_dns {
+ my $force_update = shift;
+ my $cmd = "/sbin/netconfig".($force_update ? " -f" : "")." update -m dns";
+
+ y2milestone("Updating forwarders by netconfig");
+
+ my $ret = SCR->Execute (".target.bash_output", $cmd);
+ if ($ret->{'exit'} != 0) {
+ Report->Error (sformat(__("Error occurred while calling
netconfig.\nError: %1"), $ret->{'stdout'}));
+ }
+
+ return $ret->{'exit'};
+}
+
# Writes forwarding settings and updates the system using netconfig.
# This also automatically updates /etc/named.d/forwarders.conf
sub write_local_forwarder {
@@ -1269,10 +1283,11 @@
SCR->Write (".sysconfig.network.config.NETCONFIG_DNS_FORWARDER",
GetLocalForwarder());
SCR->Write (".sysconfig.network.config", undef);
- y2milestone("Updating forwarders by netconfig");
- my $ret = SCR->Execute (".target.bash_output", "/sbin/netconfig update -m
dns");
- if ($ret->{'exit'} != 0) {
- Report->Error (__("Error occurred while calling netconfig.\nError:
".$ret->{'stdout'}));
+ my $netconfig_dns_updated = netconfig_update_dns(0);
+
+ if ($netconfig_dns_updated == 20) {
+ my $retry = Popup->YesNo (__("Do you want to force an update now?"));
+ netconfig_update_dns(1) if ($retry);
}
}
