Hello community, here is the log from the commit of package yast2-ntp-client checked in at Mon Sep 3 18:21:13 CEST 2007. -------- --- yast2-ntp-client/yast2-ntp-client.changes 2007-08-31 17:31:07.000000000 +0200 +++ /mounts/work_src_done/NOARCH/yast2-ntp-client/yast2-ntp-client.changes 2007-09-03 17:12:51.295548000 +0200 @@ -1,0 +2,15 @@ +Mon Sep 3 17:01:12 CEST 2007 - kmachalkova@suse.cz + +- Fixed adding new NTP servers when calling ntp-client from outside + (e.g. timezone) - do not re-read the configuration if it has been + already read +- Use error popup (Report::Error) if NTP test fails (#306018) +- Display 'ntpd started on boot' warning message only if we don't + use NM and/or no network device is started at boot time (#299666) +- Do not query status/stop/start NTP service during installation + (holds for NTP test and ntp proposal client) +- Replace 'Finish' button with 'Accept' button in installation + proposal +- 2.15.8 + +------------------------------------------------------------------- Old: ---- yast2-ntp-client-2.15.7.tar.bz2 New: ---- yast2-ntp-client-2.15.8.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-ntp-client.spec ++++++ --- /var/tmp/diff_new_pack.Rm1151/_old 2007-09-03 18:21:02.000000000 +0200 +++ /var/tmp/diff_new_pack.Rm1151/_new 2007-09-03 18:21:02.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-ntp-client (Version 2.15.7) +# spec file for package yast2-ntp-client (Version 2.15.8) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-ntp-client -Version: 2.15.7 +Version: 2.15.8 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-ntp-client-2.15.7.tar.bz2 +Source0: yast2-ntp-client-2.15.8.tar.bz2 prefix: /usr BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite #SLPAPI.pm @@ -36,7 +36,7 @@ Lukas Ocilka <locilka@suse.cz> %prep -%setup -n yast2-ntp-client-2.15.7 +%setup -n yast2-ntp-client-2.15.8 %build %{prefix}/bin/y2tool y2autoconf @@ -74,6 +74,18 @@ /usr/share/YaST2/schema/autoyast/rnc/ntpclient.rnc %changelog +* Mon Sep 03 2007 - kmachalkova@suse.cz +- Fixed adding new NTP servers when calling ntp-client from outside + (e.g. timezone) - do not re-read the configuration if it has been + already read +- Use error popup (Report::Error) if NTP test fails (#306018) +- Display 'ntpd started on boot' warning message only if we don't + use NM and/or no network device is started at boot time (#299666) +- Do not query status/stop/start NTP service during installation + (holds for NTP test and ntp proposal client) +- Replace 'Finish' button with 'Accept' button in installation + proposal +- 2.15.8 * Fri Aug 31 2007 - kmachalkova@suse.cz - Move all installation-related functionality into separate inst. clients (_proposal and _finish) (FaTE #302192) ++++++ yast2-ntp-client-2.15.7.tar.bz2 -> yast2-ntp-client-2.15.8.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ntp-client-2.15.7/configure new/yast2-ntp-client-2.15.8/configure --- old/yast2-ntp-client-2.15.7/configure 2007-06-15 17:10:44.000000000 +0200 +++ new/yast2-ntp-client-2.15.8/configure 2007-09-03 16:42:26.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for yast2-ntp-client 2.15.3. +# Generated by GNU Autoconf 2.61 for yast2-ntp-client 2.15.7. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -574,8 +574,8 @@ # Identity of this package. PACKAGE_NAME='yast2-ntp-client' PACKAGE_TARNAME='yast2-ntp-client' -PACKAGE_VERSION='2.15.3' -PACKAGE_STRING='yast2-ntp-client 2.15.3' +PACKAGE_VERSION='2.15.7' +PACKAGE_STRING='yast2-ntp-client 2.15.7' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" @@ -1197,7 +1197,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures yast2-ntp-client 2.15.3 to adapt to many kinds of systems. +\`configure' configures yast2-ntp-client 2.15.7 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1268,7 +1268,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-ntp-client 2.15.3:";; + short | recursive ) echo "Configuration of yast2-ntp-client 2.15.7:";; esac cat <<\_ACEOF @@ -1346,7 +1346,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-ntp-client configure 2.15.3 +yast2-ntp-client configure 2.15.7 generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1360,7 +1360,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by yast2-ntp-client $as_me 2.15.3, which was +It was created by yast2-ntp-client $as_me 2.15.7, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -2181,7 +2181,7 @@ # Define the identity of the package. PACKAGE='yast2-ntp-client' - VERSION='2.15.3' + VERSION='2.15.7' cat >>confdefs.h <<_ACEOF @@ -2408,7 +2408,7 @@ -VERSION="2.15.3" +VERSION="2.15.7" RPMNAME="yast2-ntp-client" MAINTAINER="Katarina Machalkova <kmachalkova@suse.cz>" @@ -3303,7 +3303,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-ntp-client $as_me 2.15.3, which was +This file was extended by yast2-ntp-client $as_me 2.15.7, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3346,7 +3346,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -yast2-ntp-client config.status 2.15.3 +yast2-ntp-client config.status 2.15.7 configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ntp-client-2.15.7/configure.in new/yast2-ntp-client-2.15.8/configure.in --- old/yast2-ntp-client-2.15.7/configure.in 2007-06-15 17:10:39.000000000 +0200 +++ new/yast2-ntp-client-2.15.8/configure.in 2007-09-03 16:42:21.000000000 +0200 @@ -1,9 +1,9 @@ dnl configure.in for yast2-ntp-client dnl -dnl -- This file is generated by y2autoconf 2.15.0 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.15.2 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-ntp-client, 2.15.3, http://bugs.opensuse.org/, yast2-ntp-client) +AC_INIT(yast2-ntp-client, 2.15.7, http://bugs.opensuse.org/, yast2-ntp-client) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -17,7 +17,7 @@ AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs dnl Important YaST2 variables -VERSION="2.15.3" +VERSION="2.15.7" RPMNAME="yast2-ntp-client" MAINTAINER="Katarina Machalkova <kmachalkova@suse.cz>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ntp-client-2.15.7/src/dialogs.ycp new/yast2-ntp-client-2.15.8/src/dialogs.ycp --- old/yast2-ntp-client-2.15.7/src/dialogs.ycp 2007-08-31 17:04:20.000000000 +0200 +++ new/yast2-ntp-client-2.15.8/src/dialogs.ycp 2007-09-03 16:41:34.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Dialogs definitions * Authors: Jiri Srain <jsrain@suse.cz> * - * $Id: dialogs.ycp 40655 2007-08-31 15:04:20Z kmachalkova $ + * $Id: dialogs.ycp 40723 2007-09-03 14:41:34Z kmachalkova $ */ { @@ -123,7 +123,8 @@ string help = CWM::MergeHelps (w); contents = CWM::PrepareDialog (contents, w); Wizard::SetContentsButtons (caption, contents, help, - Label::BackButton (), Label::FinishButton ()); + Label::BackButton (), + Stage::initial()? Label::AcceptButton() : Label::FinishButton ()); Wizard::HideBackButton(); Wizard::SetAbortButton(`abort, Label::CancelButton() ); @@ -213,7 +214,8 @@ string help = CWM::MergeHelps (w); contents = CWM::PrepareDialog (contents, w); Wizard::SetContentsButtons (caption, contents, help, - Label::BackButton (), Label::FinishButton ()); + Label::BackButton (), + Stage::initial()? Label::AcceptButton() : Label::FinishButton ()); Wizard::HideBackButton(); Wizard::SetAbortButton(`abort, Label::CancelButton() ); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ntp-client-2.15.7/src/ntp-client_proposal.ycp new/yast2-ntp-client-2.15.8/src/ntp-client_proposal.ycp --- old/yast2-ntp-client-2.15.7/src/ntp-client_proposal.ycp 2007-08-31 17:17:11.000000000 +0200 +++ new/yast2-ntp-client-2.15.8/src/ntp-client_proposal.ycp 2007-09-03 16:14:26.000000000 +0200 @@ -34,7 +34,7 @@ void ProposeSomething() { list ntp_items = []; - if( NtpClient::already_proposed || NtpClient::ProcessNtpConf() ) + if( NtpClient::config_has_been_read || NtpClient::ProcessNtpConf() ) { ntp_items = maplist(string server, NtpClient::GetUsedNtpServers(),{ return `item(`id(server), server); @@ -45,7 +45,7 @@ string cc = param["country"]:NtpClient::GetCurrentLanguageCode(); y2milestone("Nothing found in /etc/ntp.conf, proposing current language-based NTP server list"); ntp_items = NtpClient::GetNtpServersByCountry( cc, true ); - NtpClient::already_proposed = true; + NtpClient::config_has_been_read = true; } UI::ChangeWidget(`id(`ntp_address), `Items, ntp_items); @@ -53,8 +53,18 @@ void AddSingleServer( string server ) { - NtpClient::selected_record["address"] = server; - NtpClient::selected_record["type"] = "server"; + + integer idx = NtpClient::findSyncRecord("server", server); + + // -1 means adding new server + if (idx == -1) + { + NtpClient::selected_record["address"] = server; + NtpClient::selected_record["type"] = "server"; + } + else + NtpClient::selectSyncRecord(idx); + NtpClient::storeSyncRecord(); } @@ -122,13 +132,17 @@ { y2milestone("Running ntpdate to sync with %1", ntp_server); - integer status = 0; + integer status = -1; string service_name = "ntp"; //Stop NTP service on running system (during 1st stage, we don't care) - if( !Stage::initial() && status == 0) + if( !Stage::initial()) { - Service::Stop(service_name); + status = Service::Status (service_name); + //Stop service temporarily (otherwise ntpdate won't work) + //0 means service is running + if ( status == 0); + Service::Stop (service_name); } //Schedule package for installation @@ -137,9 +151,10 @@ integer r = (integer) SCR::Execute (.target.bash, sformat ("/usr/sbin/ntpdate '%1'", String::Quote(ntp_server))); y2milestone ("'ntpdate %1' returned %2", ntp_server, r); - if( !Stage::initial() && status == 0) + if( !Stage::initial()) { - Service::Start(service_name); + if( status == 0 ) + Service::Start(service_name); } if (r == 0) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ntp-client-2.15.7/src/NtpClient.ycp new/yast2-ntp-client-2.15.8/src/NtpClient.ycp --- old/yast2-ntp-client-2.15.7/src/NtpClient.ycp 2007-08-31 17:04:20.000000000 +0200 +++ new/yast2-ntp-client-2.15.8/src/NtpClient.ycp 2007-09-03 16:28:22.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Data for configuration of ntp-client, input and output functions. * Authors: Jiri Srain <jsrain@suse.cz> * - * $Id: NtpClient.ycp 40655 2007-08-31 15:04:20Z kmachalkova $ + * $Id: NtpClient.ycp 40721 2007-09-03 14:28:22Z kmachalkova $ * * Representation of the configuration of ntp-client. * Input and output routines. @@ -25,6 +25,7 @@ import "Report"; import "Service"; import "SLPAPI"; +import "Stage"; import "String"; import "Summary"; import "SuSEFirewall"; @@ -124,7 +125,7 @@ global boolean simple_dialog = false; -global boolean already_proposed = false; +global boolean config_has_been_read = false; /** * Abort function @@ -297,7 +298,7 @@ return false; } - already_proposed = true; + config_has_been_read = true; list<map<string, any> > value = conf["value"]:[]; integer index = -1; ntp_records = maplist (map<string, any> m, value, ``{ @@ -394,6 +395,9 @@ */ global define boolean Read() ``{ + if (config_has_been_read) + return true; + /* NtpClient read dialog caption */ string caption = _("Initializing NTP Client Configuration"); @@ -936,9 +940,16 @@ `Left(`Label(_("Testing the NTP server..."))) ); - integer status = Service::Status (service_name); - if (status == 0) - Service::Stop (service_name); + integer status = -1; + //Do not do anything to ntp service during installation + if ( !Stage::initial() ) + { + status = Service::Status (service_name); + //Stop service temporarily (otherwise ntpdate won't work) + //0 means service is running + if ( status == 0); + Service::Stop (service_name); + } y2milestone ("Testing reachability of server %1", server); // testing the server using IPv4 and then using IPv6 protocol @@ -953,8 +964,14 @@ "/usr/sbin/ntpdate -6 -q %1", server )); - if (status == 0) - Service::Start (service_name); + + //Do not do anything to ntp service during installation + if ( !Stage::initial() ) + { + //Start the service if it was running + if ( status == 0); + Service::Start (service_name); + } UI::CloseDialog(); @@ -968,8 +985,9 @@ } else { - // message report - result of test of connection to NTP server - Report::Message (_("Server is unreachable or does not respond properly.")); + // error message - result of test of connection to NTP server + // report error instead of simple message (#306018) + Report::Error (_("Server is unreachable or does not respond properly.")); } } return ok; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ntp-client-2.15.7/src/widgets.ycp new/yast2-ntp-client-2.15.8/src/widgets.ycp --- old/yast2-ntp-client-2.15.7/src/widgets.ycp 2007-08-31 17:04:20.000000000 +0200 +++ new/yast2-ntp-client-2.15.8/src/widgets.ycp 2007-09-03 15:47:31.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Widgets definitions * Authors: Jiri Srain <jsrain@suse.cz> * - * $Id: widgets.ycp 40655 2007-08-31 15:04:20Z kmachalkova $ + * $Id: widgets.ycp 40715 2007-09-03 13:47:30Z kmachalkova $ */ { @@ -17,6 +17,7 @@ import "LogView"; import "SLPAPI"; import "NetworkDevices"; +import "NetworkService"; import "NtpClient"; import "CWMFirewallInterfaces"; import "Report"; @@ -107,11 +108,20 @@ */ define symbol startHandle (string id, map event) ``{ boolean start = UI::QueryWidget (`id ("start"), `CurrentButton) == "boot"; - list<string> devices = NetworkDevices::Locate ("STARTMODE", "onboot"); + //All these network devices are possibly started on boot || managed by NM + //hence do not display the message + list<string> d1 = NetworkDevices::Locate ("STARTMODE", "onboot"); + list<string> d2 = NetworkDevices::Locate ("STARTMODE", "auto"); + list<string> d3 = NetworkDevices::Locate ("STARTMODE", "nfsroot"); + list<string> d4 = NetworkDevices::Locate ("STARTMODE", "managed"); + + list<string> devices = (list <string>) union( union(d1,d2), union(d3,d4)); devices = filter (string d, devices, ``(d != "lo")); - if (start && size (devices) == 0 && event["EventReason"]:"" != "" + //Do not display this warning if we use NetworkManager (#299666) + if (start && !NetworkService::IsManaged() && size (devices) == 0 && + event["EventReason"]:"" != "" && // continue-cancel popup - && ! Popup::ContinueCancel (_("Warning! + ! Popup::ContinueCancel (_("Warning! If you do not have a permanent Internet connection, starting the NTP daemon can take a very long time and diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ntp-client-2.15.7/VERSION new/yast2-ntp-client-2.15.8/VERSION --- old/yast2-ntp-client-2.15.7/VERSION 2007-08-31 17:23:03.000000000 +0200 +++ new/yast2-ntp-client-2.15.8/VERSION 2007-09-03 17:08:26.000000000 +0200 @@ -1 +1 @@ -2.15.7 +2.15.8 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org