Hello community, here is the log from the commit of package yast2-ntp-client for openSUSE:Factory checked in at 2014-03-11 09:23:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-ntp-client (Old) and /work/SRC/openSUSE:Factory/.yast2-ntp-client.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-ntp-client" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-ntp-client/yast2-ntp-client.changes 2014-02-03 11:40:59.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-ntp-client.new/yast2-ntp-client.changes 2014-03-11 09:24:00.000000000 +0100 @@ -1,0 +2,6 @@ +Wed Mar 5 15:18:31 UTC 2014 - [email protected] + +- bnc#863965 - NTP servers should be selected by timezone not keyboard layout +- 3.1.3 + +------------------------------------------------------------------- Old: ---- yast2-ntp-client-3.1.2.tar.bz2 New: ---- yast2-ntp-client-3.1.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-ntp-client.spec ++++++ --- /var/tmp/diff_new_pack.hKrQ0d/_old 2014-03-11 09:24:01.000000000 +0100 +++ /var/tmp/diff_new_pack.hKrQ0d/_new 2014-03-11 09:24:01.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-ntp-client -Version: 3.1.2 +Version: 3.1.3 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -25,14 +25,14 @@ BuildRequires: perl-XML-Writer BuildRequires: update-desktop-files -BuildRequires: yast2 +BuildRequires: yast2 >= 3.1.11 BuildRequires: yast2-country-data BuildRequires: yast2-devtools >= 3.1.10 BuildRequires: yast2-testsuite #SLPAPI.pm # Hostname::CurrentDomain # Wizard::SetDesktopTitleAndIcon -Requires: yast2 >= 2.21.22 +Requires: yast2 >= 3.1.11 Requires: yast2-country-data BuildArch: noarch ++++++ yast2-ntp-client-3.1.2.tar.bz2 -> yast2-ntp-client-3.1.3.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ntp-client-3.1.2/package/yast2-ntp-client.changes new/yast2-ntp-client-3.1.3/package/yast2-ntp-client.changes --- old/yast2-ntp-client-3.1.2/package/yast2-ntp-client.changes 2014-02-01 23:11:52.000000000 +0100 +++ new/yast2-ntp-client-3.1.3/package/yast2-ntp-client.changes 2014-03-06 09:12:32.000000000 +0100 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Mar 5 15:18:31 UTC 2014 - [email protected] + +- bnc#863965 - NTP servers should be selected by timezone not keyboard layout +- 3.1.3 + +------------------------------------------------------------------- Sat Feb 1 21:17:29 UTC 2014 - [email protected] - bnc#861560 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ntp-client-3.1.2/package/yast2-ntp-client.spec new/yast2-ntp-client-3.1.3/package/yast2-ntp-client.spec --- old/yast2-ntp-client-3.1.2/package/yast2-ntp-client.spec 2014-02-01 23:11:52.000000000 +0100 +++ new/yast2-ntp-client-3.1.3/package/yast2-ntp-client.spec 2014-03-06 09:12:32.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-ntp-client -Version: 3.1.2 +Version: 3.1.3 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -28,14 +28,14 @@ License: GPL-2.0+ BuildRequires: perl-XML-Writer BuildRequires: update-desktop-files -BuildRequires: yast2 +BuildRequires: yast2 >= 3.1.11 BuildRequires: yast2-country-data BuildRequires: yast2-devtools >= 3.1.10 BuildRequires: yast2-testsuite #SLPAPI.pm # Hostname::CurrentDomain # Wizard::SetDesktopTitleAndIcon -Requires: yast2 >= 2.21.22 +Requires: yast2 >= 3.1.11 Requires: yast2-country-data BuildArch: noarch diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ntp-client-3.1.2/src/clients/ntp-client_proposal.rb new/yast2-ntp-client-3.1.3/src/clients/ntp-client_proposal.rb --- old/yast2-ntp-client-3.1.2/src/clients/ntp-client_proposal.rb 2014-01-30 11:22:56.000000000 +0100 +++ new/yast2-ntp-client-3.1.3/src/clients/ntp-client_proposal.rb 2014-03-06 09:12:32.000000000 +0100 @@ -23,6 +23,7 @@ Yast.import "Popup" Yast.import "Progress" Yast.import "Report" + Yast.import "Timezone" Yast.import "Wizard" # API: @@ -64,21 +65,15 @@ NtpClient.ntp_selected = Ops.get_boolean(@param, "ntp_used", false) @ret = true elsif @func == "MakeProposal" - @cc = Ops.get_string(@param, "country") do - NtpClient.GetCurrentLanguageCode - end - @ret = MakeProposal(@cc) + @ret = MakeProposal() elsif @func == "Write" @ret = Write(@param) elsif @func == "ui_help_text" @ret = ui_help_text elsif @func == "ui_init" @rp = Ops.get_term(@param, "replace_point") { Id(:rp) } - @cc = Ops.get_string(@param, "country") do - NtpClient.GetCurrentLanguageCode - end @ft = Ops.get_boolean(@param, "first_time", false) - @ret = ui_init(@rp, @cc, @ft) + @ret = ui_init(@rp,@ft) elsif @func == "ui_try_save" @ret = ui_try_save elsif @func == "ui_enable_disable_widgets" @@ -183,8 +178,7 @@ end - # @param cc country code - def MakeProposal(cc) + def MakeProposal() ntp_items = [] #on the running system, read all the data, otherwise firewall @@ -208,18 +202,15 @@ # avoid calling Read again (bnc #427712) NtpClient.config_has_been_read = true end - # FIXME: does MakeProposal have sense? - # would it have sense if implemented properly? - # real proposal starts here, it is ui_read before... - Builtins.y2milestone("ntp_items :%1", ntp_items) if ntp_items == [] Builtins.y2milestone( - "Nothing found in /etc/ntp.conf, proposing current language-based NTP server list" + "Nothing found in /etc/ntp.conf, proposing current timezone-based NTP server list" ) - ntp_items = NtpClient.GetNtpServersByCountry(cc, true) + ntp_items = NtpClient.GetNtpServersByCountry(Timezone.GetCountryForTimezone(Timezone.timezone), true) NtpClient.config_has_been_read = true end ntp_items = Builtins.add(ntp_items, "") + Builtins.y2milestone("ntp_items :%1", ntp_items) UI.ChangeWidget(Id(:ntp_address), :Items, ntp_items) nil @@ -227,7 +218,7 @@ # @param [Boolean] first_time when asking for first time, we check if service is running # @return should our radio button be selected - def ui_init(rp, country, first_time) + def ui_init(rp, first_time) rp = deep_copy(rp) cont = VBox( VSpacing(0.5), @@ -303,7 +294,7 @@ UI.ChangeWidget(Id(:ntp_save), :Value, ntp_used) - MakeProposal(country) + MakeProposal() ntp_used end @@ -319,8 +310,7 @@ AddSingleServer(ntp_server2) retval = Convert.to_boolean(WFM.CallFunction("ntp-client")) ret = :next if retval - cc = NtpClient.GetCurrentLanguageCode - MakeProposal(cc) + MakeProposal() end ret end -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
