Hello community, here is the log from the commit of package yast2-ntp-client for openSUSE:Factory checked in at 2014-09-03 18:21:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-08-27 16:53:04.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-ntp-client.new/yast2-ntp-client.changes 2014-09-03 21:23:44.000000000 +0200 @@ -1,0 +2,15 @@ +Tue Sep 2 10:00:18 UTC 2014 - [email protected] + +- Using Report.Error to be autoyast-proof +- Fixed variable replacement int gettext string; +- Added linebreaks in too long popup content (bnc#894573) +- 3.1.12 + +------------------------------------------------------------------- +Mon Sep 1 15:34:23 UTC 2014 - [email protected] + +- Aligned "Synchronize now" button and "NTP Server Address" box (bnc#893065) +- Fixed checking of return value of "sntp -s" (bnc#893094) +- 3.1.11 + +------------------------------------------------------------------- Old: ---- yast2-ntp-client-3.1.10.tar.bz2 New: ---- yast2-ntp-client-3.1.12.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-ntp-client.spec ++++++ --- /var/tmp/diff_new_pack.d3vuT4/_old 2014-09-03 21:23:45.000000000 +0200 +++ /var/tmp/diff_new_pack.d3vuT4/_new 2014-09-03 21:23:45.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-ntp-client -Version: 3.1.10 +Version: 3.1.12 Release: 0 Summary: YaST2 - NTP Client Configuration License: GPL-2.0+ ++++++ yast2-ntp-client-3.1.10.tar.bz2 -> yast2-ntp-client-3.1.12.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ntp-client-3.1.10/package/yast2-ntp-client.changes new/yast2-ntp-client-3.1.12/package/yast2-ntp-client.changes --- old/yast2-ntp-client-3.1.10/package/yast2-ntp-client.changes 2014-08-20 16:51:18.000000000 +0200 +++ new/yast2-ntp-client-3.1.12/package/yast2-ntp-client.changes 2014-09-02 16:16:06.000000000 +0200 @@ -1,4 +1,19 @@ ------------------------------------------------------------------- +Tue Sep 2 10:00:18 UTC 2014 - [email protected] + +- Using Report.Error to be autoyast-proof +- Fixed variable replacement int gettext string; +- Added linebreaks in too long popup content (bnc#894573) +- 3.1.12 + +------------------------------------------------------------------- +Mon Sep 1 15:34:23 UTC 2014 - [email protected] + +- Aligned "Synchronize now" button and "NTP Server Address" box (bnc#893065) +- Fixed checking of return value of "sntp -s" (bnc#893094) +- 3.1.11 + +------------------------------------------------------------------- Wed Aug 20 16:27:49 CEST 2014 - [email protected] - Autoyast cloning: Do not show error popup if ntp server has not diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ntp-client-3.1.10/package/yast2-ntp-client.spec new/yast2-ntp-client-3.1.12/package/yast2-ntp-client.spec --- old/yast2-ntp-client-3.1.10/package/yast2-ntp-client.spec 2014-08-20 16:51:18.000000000 +0200 +++ new/yast2-ntp-client-3.1.12/package/yast2-ntp-client.spec 2014-09-02 16:16:06.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-ntp-client -Version: 3.1.10 +Version: 3.1.12 Release: 0 Summary: YaST2 - NTP Client Configuration License: GPL-2.0+ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ntp-client-3.1.10/src/clients/ntp-client_proposal.rb new/yast2-ntp-client-3.1.12/src/clients/ntp-client_proposal.rb --- old/yast2-ntp-client-3.1.10/src/clients/ntp-client_proposal.rb 2014-08-20 16:51:18.000000000 +0200 +++ new/yast2-ntp-client-3.1.12/src/clients/ntp-client_proposal.rb 2014-09-02 16:16:06.000000000 +0200 @@ -231,6 +231,7 @@ HWeight( 1, VBox( + VSpacing(0.5), Left( ComboBox( Id(:ntp_address), @@ -264,7 +265,6 @@ 1, VBox( Label(""), - VSpacing(0.3), # try to line up the widgets horizontally # push button label Left(PushButton(Id(:ntp_now), _("S&ynchronize now"))), VSpacing(0.3), @@ -350,23 +350,21 @@ # return: # `success, `invalid_hostname or `ntpdate_failed def Write(param) - param = deep_copy(param) - ret = nil - ntp_servers = Ops.get_list(param, "servers", []) - ntp_server = Ops.get_string(param, "server", "") - run_service = Ops.get_boolean(param, "run_service", true) + ntp_servers = param["servers"] || [] + ntp_server = param["server"] || "" + run_service = param["run_service"] || true if ntp_server == "" # get the value from UI only when it wasn't given as a parameter - ntp_server = Convert.to_string(UI.QueryWidget(Id(:ntp_address), :Value)) + ntp_server = UI.QueryWidget(Id(:ntp_address), :Value) end return :invalid_hostname if !ValidateSingleServer(ntp_server) WriteNtpSettings(ntp_servers, ntp_server, run_service) - return :success if Ops.get_boolean(param, "write_only", false) + return :success if param["write_only"] # One-time adjusment without running the ntp daemon # Meanwhile, ntpdate was replaced by sntp - ntpdate_only = Ops.get_boolean(param, "ntpdate_only", false) + ntpdate_only = param["ntpdate_only"] required_package = "ntp" @@ -393,7 +391,8 @@ ) end end - r = 0 + + ret = 0 if NetworkService.isNetworkRunning #Only if network is running try to synchronize the ntp server Popup.ShowFeedback("", _("Synchronizing with NTP server...")) @@ -403,21 +402,16 @@ # -s: do set the system time # -t 5: timeout of 5 seconds # -l <file>: log to a file to not mess text mode installation - r2 = Convert.to_integer( - SCR.Execute( - path(".target.bash"), - Builtins.sformat( - "/usr/sbin/sntp -l /var/log/YaST2/sntp.log -t 5 -s '%1'", - String.Quote(ntp_server) - ) - ) - ) - Builtins.y2milestone("'sntp %1' returned %2", ntp_server, r2) + ret = SCR.Execute( + path(".target.bash"), + "/usr/sbin/sntp -l /var/log/YaST2/sntp.log -t 5 -s '#{String.Quote(ntp_server)}'" + ) + Builtins.y2milestone("'sntp %1' returned %2", ntp_server, ret) Popup.ClearFeedback end - return :ntpdate_failed if r != 0 + return :ntpdate_failed if ret != 0 # User wants to more than running sntp (synchronize on boot) WriteNtpSettings(ntp_servers, ntp_server, run_service) if !ntpdate_only @@ -427,13 +421,12 @@ # ui = UI::UserInput def ui_handle(ui) - ui = deep_copy(ui) redraw = false if ui == :ntp_configure rv = AskUser() if rv == :invalid_hostname handle_invalid_hostname( - Convert.to_string(UI.QueryWidget(Id(:ntp_address), :Value)) + UI.QueryWidget(Id(:ntp_address), :Value) ) elsif rv == :next && !Stage.initial # show the 'save' status after configuration @@ -443,11 +436,11 @@ if ui == :ntp_now rv = Write({ "ntpdate_only" => true }) if rv == :invalid_hostname - handle_invalid_hostname( - Convert.to_string(UI.QueryWidget(Id(:ntp_address), :Value)) - ) + handle_invalid_hostname(UI.QueryWidget(Id(:ntp_address), :Value)) elsif rv == :success redraw = true # update time widgets + else + Report.Error(_("Connection to selected NTP server failed.")) end end @@ -479,7 +472,9 @@ if Popup.YesNo( Builtins.sformat( _( - "'Test query to server '%1' failed. If server is not yet accessible or network is not configured click 'No' to ignore. Revisit NTP server configuration?" + "Test query to server '%1' failed.\n" + + "If server is not yet accessible or network is not configured\n"+ + "click 'No' to ignore. Revisit NTP server configuration?" ), server ) -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
