Hello community,
here is the log from the commit of package yast2-ntp-client
checked in at Thu Sep 6 21:23:36 CEST 2007.
--------
--- yast2-ntp-client/yast2-ntp-client.changes 2007-09-03 17:12:51.000000000 +0200
+++ /mounts/work_src_done/NOARCH/yast2-ntp-client/yast2-ntp-client.changes 2007-09-06 18:56:10.584221000 +0200
@@ -1,0 +2,10 @@
+Thu Sep 6 18:51:37 CEST 2007 - kmachalkova@suse.cz
+
+- Accept IP as a valid NTP server address (#308265)
+- Use Packages::addAdditionalPackage() for marking xntp package for
+ installation so that it is not discarded later on (#307363)
+- Correct fix for not re-reading NTP configuration when calling
+ ntp-client from outside (no exception for the 1st stage)
+- 2.15.9
+
+-------------------------------------------------------------------
Old:
----
yast2-ntp-client-2.15.8.tar.bz2
New:
----
yast2-ntp-client-2.15.9.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-ntp-client.spec ++++++
--- /var/tmp/diff_new_pack.M11493/_old 2007-09-06 21:23:08.000000000 +0200
+++ /var/tmp/diff_new_pack.M11493/_new 2007-09-06 21:23:08.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-ntp-client (Version 2.15.8)
+# spec file for package yast2-ntp-client (Version 2.15.9)
#
# 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.8
+Version: 2.15.9
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-ntp-client-2.15.8.tar.bz2
+Source0: yast2-ntp-client-2.15.9.tar.bz2
prefix: /usr
BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite
#SLPAPI.pm
@@ -36,7 +36,7 @@
Lukas Ocilka
%prep
-%setup -n yast2-ntp-client-2.15.8
+%setup -n yast2-ntp-client-2.15.9
%build
%{prefix}/bin/y2tool y2autoconf
@@ -74,6 +74,13 @@
/usr/share/YaST2/schema/autoyast/rnc/ntpclient.rnc
%changelog
+* Thu Sep 06 2007 - kmachalkova@suse.cz
+- Accept IP as a valid NTP server address (#308265)
+- Use Packages::addAdditionalPackage() for marking xntp package for
+ installation so that it is not discarded later on (#307363)
+- Correct fix for not re-reading NTP configuration when calling
+ ntp-client from outside (no exception for the 1st stage)
+- 2.15.9
* 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
++++++ yast2-ntp-client-2.15.8.tar.bz2 -> yast2-ntp-client-2.15.9.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ntp-client-2.15.8/src/dialogs.ycp new/yast2-ntp-client-2.15.9/src/dialogs.ycp
--- old/yast2-ntp-client-2.15.8/src/dialogs.ycp 2007-09-03 16:41:34.000000000 +0200
+++ new/yast2-ntp-client-2.15.9/src/dialogs.ycp 2007-09-06 18:18:47.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Dialogs definitions
* Authors: Jiri Srain
*
- * $Id: dialogs.ycp 40723 2007-09-03 14:41:34Z kmachalkova $
+ * $Id: dialogs.ycp 40794 2007-09-06 16:18:46Z kmachalkova $
*/
{
@@ -53,21 +53,14 @@
define symbol ReadDialog() ``{
Wizard::RestoreHelp(HELPS["read"]:"");
- if(Stage::initial())
- {
- NtpClient::ProcessNtpConf();
- return `next;
- }
- else
- {
- // checking for root permissions (#158483)
- if (!Confirm::MustBeRoot())
- return `abort;
-
- NtpClient::AbortFunction = PollAbort;
- boolean ret = NtpClient::Read();
- return ret ? `next : `abort;
- }
+ // checking for root permissions (#158483)
+ if (!Stage::initial() && !Confirm::MustBeRoot())
+ return `abort;
+
+ NtpClient::AbortFunction = PollAbort;
+ boolean ret = NtpClient::Read();
+ return ret ? `next : `abort;
+
}
/**
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ntp-client-2.15.8/src/ntp-client_proposal.ycp new/yast2-ntp-client-2.15.9/src/ntp-client_proposal.ycp
--- old/yast2-ntp-client-2.15.8/src/ntp-client_proposal.ycp 2007-09-03 16:14:26.000000000 +0200
+++ new/yast2-ntp-client-2.15.9/src/ntp-client_proposal.ycp 2007-09-06 18:14:12.000000000 +0200
@@ -8,13 +8,14 @@
{
textdomain "ntp-client";
-import "Hostname";
+import "Address";
import "NetworkService";
import "NtpClient";
import "Service";
import "String";
import "Stage";
import "Package";
+import "Packages";
import "Pkg";
y2milestone("----------------------------------------");
@@ -47,6 +48,7 @@
ntp_items = NtpClient::GetNtpServersByCountry( cc, true );
NtpClient::config_has_been_read = true;
}
+ ntp_items = add(ntp_items, "");
UI::ChangeWidget(`id(`ntp_address), `Items, ntp_items);
}
@@ -68,6 +70,17 @@
NtpClient::storeSyncRecord();
}
+boolean ValidateSingleServer( string ntp_server )
+{
+ if (!Address::Check(ntp_server) )
+ {
+ UI::SetFocus(`id(`ntp_address));
+ return false;
+ }
+
+ return true;
+}
+
if (func == "CreateUI")
{
term cont =
@@ -123,11 +136,8 @@
else if (func == "Write")
{
string ntp_server = (string) UI::QueryWidget(`id(`ntp_address), `Value);
- if (!Hostname::CheckFQ(ntp_server))
- {
- UI::SetFocus(`id(`ntp_address));
+ if ( !ValidateSingleServer( ntp_server ) )
ret = `invalid_hostname;
- }
else
{
y2milestone("Running ntpdate to sync with %1", ntp_server);
@@ -141,12 +151,12 @@
status = Service::Status (service_name);
//Stop service temporarily (otherwise ntpdate won't work)
//0 means service is running
- if ( status == 0);
+ if ( status == 0)
Service::Stop (service_name);
}
//Schedule package for installation
- Pkg::PkgInstall("xntp");
+ Packages::addAdditionalPackage("xntp");
integer r = (integer) SCR::Execute (.target.bash, sformat ("/usr/sbin/ntpdate '%1'", String::Quote(ntp_server)));
y2milestone ("'ntpdate %1' returned %2", ntp_server, r);
@@ -170,9 +180,15 @@
else if (func == "AskUser")
{
string ntp_server = (string) UI::QueryWidget(`id(`ntp_address), `Value);
- AddSingleServer(ntp_server);
- ret = (symbol) WFM::CallFunction("ntp-client");
- ProposeSomething();
+ if ( !ValidateSingleServer( ntp_server ) )
+ ret = `invalid_hostname;
+ else
+ {
+ string ntp_server = (string) UI::QueryWidget(`id(`ntp_address), `Value);
+ AddSingleServer(ntp_server);
+ ret = (symbol) WFM::CallFunction("ntp-client");
+ ProposeSomething();
+ }
}
y2milestone("Ntp client proposal finished");
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ntp-client-2.15.8/VERSION new/yast2-ntp-client-2.15.9/VERSION
--- old/yast2-ntp-client-2.15.8/VERSION 2007-09-03 17:08:26.000000000 +0200
+++ new/yast2-ntp-client-2.15.9/VERSION 2007-09-06 18:29:19.000000000 +0200
@@ -1 +1 @@
-2.15.8
+2.15.9
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org