Hello community, here is the log from the commit of package yast2-ntp-client for openSUSE:Factory checked in at 2014-04-05 14:43:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-03-11 09:24:00.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-ntp-client.new/yast2-ntp-client.changes 2014-04-05 14:43:10.000000000 +0200 @@ -1,0 +2,24 @@ +Thu Apr 3 11:52:14 UTC 2014 - [email protected] + +- change path for ntptimeset(bnc#871367) +- 3.1.7 + +------------------------------------------------------------------- +Tue Apr 1 11:22:41 UTC 2014 - [email protected] + +- adapt to new ntp service name (see bnc#871367) +- 3.1.6 + +------------------------------------------------------------------- +Fri Mar 28 13:31:07 UTC 2014 - [email protected] + +- Fix failing testsuite +- 3.1.5 + +------------------------------------------------------------------- +Thu Mar 27 14:25:29 UTC 2014 - [email protected] + +- bnc#866313 - NTP in Installer: Offers remote functionality, but no network is configured +- 3.1.4 + +------------------------------------------------------------------- Old: ---- yast2-ntp-client-3.1.3.tar.bz2 New: ---- yast2-ntp-client-3.1.7.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-ntp-client.spec ++++++ --- /var/tmp/diff_new_pack.b8hwcc/_old 2014-04-05 14:43:11.000000000 +0200 +++ /var/tmp/diff_new_pack.b8hwcc/_new 2014-04-05 14:43:11.000000000 +0200 @@ -17,12 +17,13 @@ Name: yast2-ntp-client -Version: 3.1.3 +Version: 3.1.7 Release: 0 - +Summary: YaST2 - NTP Client Configuration +License: GPL-2.0+ +Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: %{name}-%{version}.tar.bz2 - BuildRequires: perl-XML-Writer BuildRequires: update-desktop-files BuildRequires: yast2 >= 3.1.11 @@ -34,14 +35,8 @@ # Wizard::SetDesktopTitleAndIcon Requires: yast2 >= 3.1.11 Requires: yast2-country-data - -BuildArch: noarch - Requires: yast2-ruby-bindings >= 1.0.0 - -Summary: YaST2 - NTP Client Configuration -License: GPL-2.0+ -Group: System/YaST +BuildArch: noarch %description This package contains the YaST2 component for NTP client configuration. ++++++ yast2-ntp-client-3.1.3.tar.bz2 -> yast2-ntp-client-3.1.7.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ntp-client-3.1.3/package/yast2-ntp-client.changes new/yast2-ntp-client-3.1.7/package/yast2-ntp-client.changes --- old/yast2-ntp-client-3.1.3/package/yast2-ntp-client.changes 2014-03-06 09:12:32.000000000 +0100 +++ new/yast2-ntp-client-3.1.7/package/yast2-ntp-client.changes 2014-04-03 14:25:50.000000000 +0200 @@ -1,4 +1,28 @@ ------------------------------------------------------------------- +Thu Apr 3 11:52:14 UTC 2014 - [email protected] + +- change path for ntptimeset(bnc#871367) +- 3.1.7 + +------------------------------------------------------------------- +Tue Apr 1 11:22:41 UTC 2014 - [email protected] + +- adapt to new ntp service name (see bnc#871367) +- 3.1.6 + +------------------------------------------------------------------- +Fri Mar 28 13:31:07 UTC 2014 - [email protected] + +- Fix failing testsuite +- 3.1.5 + +------------------------------------------------------------------- +Thu Mar 27 14:25:29 UTC 2014 - [email protected] + +- bnc#866313 - NTP in Installer: Offers remote functionality, but no network is configured +- 3.1.4 + +------------------------------------------------------------------- Wed Mar 5 15:18:31 UTC 2014 - [email protected] - bnc#863965 - NTP servers should be selected by timezone not keyboard layout diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ntp-client-3.1.3/package/yast2-ntp-client.spec new/yast2-ntp-client-3.1.7/package/yast2-ntp-client.spec --- old/yast2-ntp-client-3.1.3/package/yast2-ntp-client.spec 2014-03-06 09:12:32.000000000 +0100 +++ new/yast2-ntp-client-3.1.7/package/yast2-ntp-client.spec 2014-04-03 14:25:50.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package yast2-ntp-client # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products 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,15 +17,13 @@ Name: yast2-ntp-client -Version: 3.1.3 +Version: 3.1.7 Release: 0 - +Summary: YaST2 - NTP Client Configuration +License: GPL-2.0+ +Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: %{name}-%{version}.tar.bz2 - - -Group: System/YaST -License: GPL-2.0+ BuildRequires: perl-XML-Writer BuildRequires: update-desktop-files BuildRequires: yast2 >= 3.1.11 @@ -36,21 +34,18 @@ # Hostname::CurrentDomain # Wizard::SetDesktopTitleAndIcon Requires: yast2 >= 3.1.11 -Requires: yast2-country-data - -BuildArch: noarch - +Requires: yast2-country-data Requires: yast2-ruby-bindings >= 1.0.0 +BuildArch: noarch -Summary: YaST2 - NTP Client Configuration %description This package contains the YaST2 component for NTP client configuration. %package devel-doc Requires: yast2-ntp-client = %version -Group: System/YaST Summary: YaST2 - NTP Client - Development Documentation +Group: System/YaST %description devel-doc This package contains development documentation for using the API @@ -65,7 +60,6 @@ %install %yast_install - %files %defattr(-,root,root) %dir %{yast_yncludedir}/ntp-client diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ntp-client-3.1.3/src/clients/ntp-client_proposal.rb new/yast2-ntp-client-3.1.7/src/clients/ntp-client_proposal.rb --- old/yast2-ntp-client-3.1.3/src/clients/ntp-client_proposal.rb 2014-03-06 09:12:32.000000000 +0100 +++ new/yast2-ntp-client-3.1.7/src/clients/ntp-client_proposal.rb 2014-04-03 14:25:50.000000000 +0200 @@ -123,7 +123,11 @@ def ui_enable_disable_widgets(enabled) UI.ChangeWidget(Id(:ntp_address), :Enabled, enabled) UI.ChangeWidget(Id(:run_service), :Enabled, enabled) - UI.ChangeWidget(Id(:ntp_now), :Enabled, enabled) + if !NetworkService.isNetworkRunning + UI.ChangeWidget(Id(:ntp_now), :Enabled, false) + else + UI.ChangeWidget(Id(:ntp_now), :Enabled, enabled) + end UI.ChangeWidget(Id(:ntp_save), :Enabled, enabled) if UI.WidgetExists(Id(:ntp_configure)) # bnc#483787 UI.ChangeWidget(Id(:ntp_configure), :Enabled, enabled) @@ -278,11 +282,7 @@ UI.ReplaceWidget(rp, cont) if !NetworkService.isNetworkRunning - Builtins.y2warning( - "Network is not running, NTP synchronization will not be available" - ) - # If network not running we have to be able to configure ntp nevertheless - # UI::ChangeWidget(`id(`ntp_content), `Enabled, false); // FIXME it is outside + UI.ChangeWidget(Id(:ntp_now),:Enabled,false); end # ^ createui0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ntp-client-3.1.3/src/modules/NtpClient.rb new/yast2-ntp-client-3.1.7/src/modules/NtpClient.rb --- old/yast2-ntp-client-3.1.3/src/modules/NtpClient.rb 2014-03-06 09:12:32.000000000 +0100 +++ new/yast2-ntp-client-3.1.7/src/modules/NtpClient.rb 2014-04-03 14:25:50.000000000 +0200 @@ -67,7 +67,7 @@ @cron_file = "/etc/cron.d/novell.ntp-synchronize" # Service name of the NTP daemon - @service_name = "ntp" + @service_name = "ntpd" # Should the daemon be started in chroot environment? @run_chroot = false @@ -858,25 +858,28 @@ Progress.set(progress_orig) end - if !Service.Adjust(@service_name, @run_service ? "enable" : "disable") + adjusted = false + if @run_service && Service.Enable(@service_name) + adjusted = true + end + if !@run_service && Service.Disable(@service_name) + adjusted = true + end + unless adjusted # error report Report.Error(Message.CannotAdjustService("NTP")) end - if @run_service && !@write_only && - 0 != Service.RunInitScript(@service_name, "restart") + if @run_service && !@write_only && Service.Restart(@service_name) # error report Report.Error(_("Cannot restart the NTP daemon.")) end - Service.RunInitScript(@service_name, "stop") if !@run_service + Service.Stop(@service_name) if !@run_service if @synchronize_time SCR.Write( path(".target.string"), @cron_file, - Ops.add( - Ops.add("-*/", @sync_interval), - " * * * * root /etc/init.d/ntp ntptimeset &>/dev/null\n" - ) + "-*/#{@sync_interval} * * * * root /usr/sbin/start-ntpd ntptimeset &>/dev/null\n" ) else SCR.Execute( diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ntp-client-3.1.3/testsuite/tests/Read.rb new/yast2-ntp-client-3.1.7/testsuite/tests/Read.rb --- old/yast2-ntp-client-3.1.3/testsuite/tests/Read.rb 2014-03-06 09:12:32.000000000 +0100 +++ new/yast2-ntp-client-3.1.7/testsuite/tests/Read.rb 2014-04-03 14:25:50.000000000 +0200 @@ -84,7 +84,16 @@ "target" => { "string" => "", "tmpdir" => "/tmp", "size" => 0 } } @WRITE = {} - @EXEC = { "target" => { "bash_output" => {}, "bash" => 1 } } + @EXEC = { + "target" => { + "bash_output" => { + "exit" => 0, + "stdout" => "", + "stderr" => "" + } + }, + "bash" => 1 + } TESTSUITE_INIT([@READ, @WRITE, @EXEC], nil) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ntp-client-3.1.3/testsuite/tests/Write.out new/yast2-ntp-client-3.1.7/testsuite/tests/Write.out --- old/yast2-ntp-client-3.1.3/testsuite/tests/Write.out 2014-03-06 09:12:32.000000000 +0100 +++ new/yast2-ntp-client-3.1.7/testsuite/tests/Write.out 2014-04-03 14:25:50.000000000 +0200 @@ -7,7 +7,5 @@ Execute .target.bash "/sbin/netconfig update -m ntp" 0 Write .sysconfig.ntp.NTPD_RUN_CHROOTED "yes" true Write .sysconfig.ntp nil true -Log Unable to disable service ntp -Log Cannot adjust 'NTP' service. Execute .target.bash "test -e /etc/cron.d/novell.ntp-synchronize && rm /etc/cron.d/novell.ntp-synchronize;" 0 Return true diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ntp-client-3.1.3/testsuite/tests/Write.rb new/yast2-ntp-client-3.1.7/testsuite/tests/Write.rb --- old/yast2-ntp-client-3.1.3/testsuite/tests/Write.rb 2014-03-06 09:12:32.000000000 +0100 +++ new/yast2-ntp-client-3.1.7/testsuite/tests/Write.rb 2014-04-03 14:25:50.000000000 +0200 @@ -42,7 +42,15 @@ "target" => { "string" => "", "tmpdir" => "/tmp", "size" => 0 } } @WRITE = {} - @EXEC = { "target" => { "bash_output" => {} } } + @EXEC = { + "target" => { + "bash_output" => { + "exit" => 0, + "stdout" => "", + "stderr" => "" + } + } + } TESTSUITE_INIT([@READ, @WRITE, @EXEC], nil) -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
