Hello community, here is the log from the commit of package yast2-tftp-server for openSUSE:Factory checked in at 2018-02-14 10:51:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-tftp-server (Old) and /work/SRC/openSUSE:Factory/.yast2-tftp-server.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-tftp-server" Wed Feb 14 10:51:11 2018 rev:31 rq:576021 version:4.0.1 Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-tftp-server/yast2-tftp-server.changes 2018-02-02 22:23:43.437837247 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-tftp-server.new/yast2-tftp-server.changes 2018-02-14 10:51:11.510612731 +0100 @@ -1,0 +2,7 @@ +Tue Feb 13 10:06:15 CET 2018 - [email protected] + +- Merging changed settings with already existing configuration. + (bnc#1080557) +- 4.0.1 + +------------------------------------------------------------------- Old: ---- yast2-tftp-server-4.0.0.tar.bz2 New: ---- yast2-tftp-server-4.0.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-tftp-server.spec ++++++ --- /var/tmp/diff_new_pack.cXT0e5/_old 2018-02-14 10:51:11.970596177 +0100 +++ /var/tmp/diff_new_pack.cXT0e5/_new 2018-02-14 10:51:11.970596177 +0100 @@ -17,7 +17,7 @@ Name: yast2-tftp-server -Version: 4.0.0 +Version: 4.0.1 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-tftp-server-4.0.0.tar.bz2 -> yast2-tftp-server-4.0.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-tftp-server-4.0.0/package/yast2-tftp-server.changes new/yast2-tftp-server-4.0.1/package/yast2-tftp-server.changes --- old/yast2-tftp-server-4.0.0/package/yast2-tftp-server.changes 2018-02-02 18:19:19.000000000 +0100 +++ new/yast2-tftp-server-4.0.1/package/yast2-tftp-server.changes 2018-02-13 10:44:36.000000000 +0100 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Feb 13 10:06:15 CET 2018 - [email protected] + +- Merging changed settings with already existing configuration. + (bnc#1080557) +- 4.0.1 + +------------------------------------------------------------------- Fri Feb 2 14:24:30 UTC 2018 - [email protected] - switch from xinetd to systemd socket activation (fate#323373) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-tftp-server-4.0.0/package/yast2-tftp-server.spec new/yast2-tftp-server-4.0.1/package/yast2-tftp-server.spec --- old/yast2-tftp-server-4.0.0/package/yast2-tftp-server.spec 2018-02-02 18:19:19.000000000 +0100 +++ new/yast2-tftp-server-4.0.1/package/yast2-tftp-server.spec 2018-02-13 10:44:36.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-tftp-server -Version: 4.0.0 +Version: 4.0.1 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-tftp-server-4.0.0/src/clients/tftp-server_auto.rb new/yast2-tftp-server-4.0.1/src/clients/tftp-server_auto.rb --- old/yast2-tftp-server-4.0.0/src/clients/tftp-server_auto.rb 2018-02-02 18:19:19.000000000 +0100 +++ new/yast2-tftp-server-4.0.1/src/clients/tftp-server_auto.rb 2018-02-13 10:44:36.000000000 +0100 @@ -77,6 +77,8 @@ Progress.set(@progress_orig) # Write givven settings elsif @func == "Write" + # Merging current settings with already existing configuration. + TftpServer.merge_to_system Yast.import "Progress" @progress_orig = Progress.set(false) @ret = TftpServer.Write @@ -90,11 +92,10 @@ @ret = false end - return deep_copy(@ret) - Builtins.y2debug("ret=%1", @ret) Builtins.y2milestone("TftpServer auto finished") Builtins.y2milestone("----------------------------------------") + return deep_copy(@ret) end end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-tftp-server-4.0.0/src/modules/TftpServer.rb new/yast2-tftp-server-4.0.1/src/modules/TftpServer.rb --- old/yast2-tftp-server-4.0.0/src/modules/TftpServer.rb 2018-02-02 18:19:19.000000000 +0100 +++ new/yast2-tftp-server-4.0.1/src/modules/TftpServer.rb 2018-02-13 10:44:36.000000000 +0100 @@ -230,6 +230,16 @@ deep_copy(settings) end + + # Mergeing config to existing system configuration. It is useful for delayed write. + # So if package will be installed later this method re-apply changes on top of newly parsed + # file. + def merge_to_system + config = Export() + Read() + Import(config) + end + # @return Html formatted configuration summary def Summary summary = ""
