Hello community,
here is the log from the commit of package yast2-ntp-client
checked in at Thu Apr 13 17:31:02 CEST 2006.
--------
--- yast2-ntp-client/yast2-ntp-client.changes 2006-04-11 11:54:34.000000000 +0200
+++ NOARCH/yast2-ntp-client/yast2-ntp-client.changes 2006-04-13 16:04:42.000000000 +0200
@@ -1,0 +2,7 @@
+Thu Apr 13 16:02:25 CEST 2006 - locilka@suse.cz
+
+- Leaving the 'initial_sync' and 'options' for pool.ntp.org feature
+ without change when user has previously changed them (#165852).
+- 2.13.7
+
+-------------------------------------------------------------------
Old:
----
yast2-ntp-client-2.13.6.tar.bz2
New:
----
yast2-ntp-client-2.13.7.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-ntp-client.spec ++++++
--- /var/tmp/diff_new_pack.36TNak/_old 2006-04-13 17:30:42.000000000 +0200
+++ /var/tmp/diff_new_pack.36TNak/_new 2006-04-13 17:30:42.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-ntp-client (Version 2.13.6)
+# spec file for package yast2-ntp-client (Version 2.13.7)
#
# Copyright (c) 2006 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.13.6
+Version: 2.13.7
Release: 1
License: GPL
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-ntp-client-2.13.6.tar.bz2
+Source0: yast2-ntp-client-2.13.7.tar.bz2
prefix: /usr
BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-slp yast2-testsuite
Requires: yast2 yast2-slp yast2-country
@@ -33,7 +33,7 @@
Jiri Srain
%prep
-%setup -n yast2-ntp-client-2.13.6
+%setup -n yast2-ntp-client-2.13.7
%build
%{prefix}/bin/y2tool y2autoconf
@@ -70,6 +70,10 @@
%doc %{prefix}/share/doc/packages/yast2-ntp-client
%changelog -n yast2-ntp-client
+* Thu Apr 13 2006 - locilka@suse.cz
+- Leaving the 'initial_sync' and 'options' for pool.ntp.org feature
+ without change when user has previously changed them (#165852).
+- 2.13.7
* Tue Apr 11 2006 - locilka@suse.cz
- Switching from simple to complex configuration was eating server
entries (#165149).
++++++ yast2-ntp-client-2.13.6.tar.bz2 -> yast2-ntp-client-2.13.7.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ntp-client-2.13.6/Makefile.am new/yast2-ntp-client-2.13.7/Makefile.am
--- old/yast2-ntp-client-2.13.6/Makefile.am 2006-04-11 11:55:50.000000000 +0200
+++ new/yast2-ntp-client-2.13.7/Makefile.am 2006-04-13 16:05:18.000000000 +0200
@@ -154,7 +154,7 @@
$(PREFIX)/bin/y2tool create-spec < $$i > $$here/package/$${newname} ; \
done
-package: check-up-to-date check-tagversion check-all-packages check-textdomain package-local
+package: check-up-to-date check-tagversion check-all-packages package-local
TAGVERSION = $(PREFIX)/bin/y2tool tagversion
@@ -199,9 +199,6 @@
false; \
fi
-check-textdomain:
- $(PREFIX)/bin/y2tool check-textdomain $(srcdir)
-
stable: checkin-stable
checkin-stable: package
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ntp-client-2.13.6/Makefile.in new/yast2-ntp-client-2.13.7/Makefile.in
--- old/yast2-ntp-client-2.13.6/Makefile.in 2006-04-11 11:55:57.000000000 +0200
+++ new/yast2-ntp-client-2.13.7/Makefile.in 2006-04-13 16:05:24.000000000 +0200
@@ -783,7 +783,7 @@
$(PREFIX)/bin/y2tool create-spec < $$i > $$here/package/$${newname} ; \
done
-package: check-up-to-date check-tagversion check-all-packages check-textdomain package-local
+package: check-up-to-date check-tagversion check-all-packages package-local
check-up-to-date check-cvs-up-to-date check-svn-up-to-date:
if [ -d $(srcdir)/CVS ]; then \
@@ -826,9 +826,6 @@
false; \
fi
-check-textdomain:
- $(PREFIX)/bin/y2tool check-textdomain $(srcdir)
-
stable: checkin-stable
checkin-stable: package
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ntp-client-2.13.6/VERSION new/yast2-ntp-client-2.13.7/VERSION
--- old/yast2-ntp-client-2.13.6/VERSION 2006-04-11 11:52:37.000000000 +0200
+++ new/yast2-ntp-client-2.13.7/VERSION 2006-04-13 16:02:22.000000000 +0200
@@ -1 +1 @@
-2.13.6
+2.13.7
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ntp-client-2.13.6/configure new/yast2-ntp-client-2.13.7/configure
--- old/yast2-ntp-client-2.13.6/configure 2006-04-11 11:55:54.000000000 +0200
+++ new/yast2-ntp-client-2.13.7/configure 2006-04-13 16:05:22.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for yast2-ntp-client 2.13.6.
+# Generated by GNU Autoconf 2.59 for yast2-ntp-client 2.13.7.
#
# Report bugs to http://www.suse.de/feedback.
#
@@ -269,8 +269,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-ntp-client'
PACKAGE_TARNAME='yast2-ntp-client'
-PACKAGE_VERSION='2.13.6'
-PACKAGE_STRING='yast2-ntp-client 2.13.6'
+PACKAGE_VERSION='2.13.7'
+PACKAGE_STRING='yast2-ntp-client 2.13.7'
PACKAGE_BUGREPORT='http://www.suse.de/feedback'
ac_unique_file="RPMNAME"
@@ -728,7 +728,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.13.6 to adapt to many kinds of systems.
+\`configure' configures yast2-ntp-client 2.13.7 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -795,7 +795,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-ntp-client 2.13.6:";;
+ short | recursive ) echo "Configuration of yast2-ntp-client 2.13.7:";;
esac
cat <<\_ACEOF
@@ -908,7 +908,7 @@
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
-yast2-ntp-client configure 2.13.6
+yast2-ntp-client configure 2.13.7
generated by GNU Autoconf 2.59
Copyright (C) 2003 Free Software Foundation, Inc.
@@ -922,7 +922,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.13.6, which was
+It was created by yast2-ntp-client $as_me 2.13.7, which was
generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@
@@ -1652,7 +1652,7 @@
# Define the identity of the package.
PACKAGE='yast2-ntp-client'
- VERSION='2.13.6'
+ VERSION='2.13.7'
cat >>confdefs.h <<_ACEOF
@@ -1863,7 +1863,7 @@
-VERSION="2.13.6"
+VERSION="2.13.7"
RPMNAME="yast2-ntp-client"
MAINTAINER="Lukas Ocilka "
@@ -2693,7 +2693,7 @@
} >&5
cat >&5 <<_CSEOF
-This file was extended by yast2-ntp-client $as_me 2.13.6, which was
+This file was extended by yast2-ntp-client $as_me 2.13.7, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -2748,7 +2748,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-ntp-client config.status 2.13.6
+yast2-ntp-client config.status 2.13.7
configured by $0, generated by GNU Autoconf 2.59,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ntp-client-2.13.6/configure.in new/yast2-ntp-client-2.13.7/configure.in
--- old/yast2-ntp-client-2.13.6/configure.in 2006-04-11 11:55:50.000000000 +0200
+++ new/yast2-ntp-client-2.13.7/configure.in 2006-04-13 16:05:18.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-ntp-client, 2.13.6, http://www.suse.de/feedback, yast2-ntp-client)
+AC_INIT(yast2-ntp-client, 2.13.7, http://www.suse.de/feedback, 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.13.6"
+VERSION="2.13.7"
RPMNAME="yast2-ntp-client"
MAINTAINER="Lukas Ocilka "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ntp-client-2.13.6/src/NtpClient.ycp new/yast2-ntp-client-2.13.7/src/NtpClient.ycp
--- old/yast2-ntp-client-2.13.6/src/NtpClient.ycp 2006-04-11 11:55:01.000000000 +0200
+++ new/yast2-ntp-client-2.13.7/src/NtpClient.ycp 2006-04-13 16:05:03.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Data for configuration of ntp-client, input and output functions.
* Authors: Jiri Srain
*
- * $Id: NtpClient.ycp 29971 2006-04-11 09:54:58Z locilka $
+ * $Id: NtpClient.ycp 30111 2006-04-13 14:04:55Z locilka $
*
* Representation of the configuration of ntp-client.
* Input and output routines.
@@ -458,6 +458,17 @@
* into the current configuration.
*/
global define void ActivateRandomPoolServersFunction () {
+ // leave the current configuration if any
+ map > store_current_options = $[];
+ foreach (map one_record, ntp_records, {
+ if (one_record["type"]:"" == "server" && one_record["address"]:"" != "") {
+ string one_address = one_record["address"]:"";
+ store_current_options[one_address] = $[];
+ store_current_options[one_address, "options"] = one_record["options"]:"";
+ store_current_options[one_address, "initial_sync"] = one_record["initial_sync"]:true;
+ }
+ });
+
// remove all old ones
DeActivateRandomPoolServersFunction();
@@ -469,11 +480,21 @@
});
foreach (string one_server, random_pool_servers, {
+ boolean one_initial_sync = true;
+ string one_options = "";
+
+ if (haskey(store_current_options, one_server)) {
+ one_initial_sync = store_current_options[one_server, "initial_sync"]:true;
+ one_options = store_current_options[one_server, "options"]:"";
+ y2milestone("Leaving current configuration for server '%1', initial_sync: '%2', options '%3'",
+ one_server, one_initial_sync, one_options);
+ }
+
ntp_records = add (ntp_records, $[
"address":one_server,
"comment":"\n# Random pool server, see http://www.pool.ntp.org/ for more information\n",
- "initial_sync":true,
- "options":"",
+ "initial_sync":one_initial_sync,
+ "options":one_options,
"type":"server"
]);
});
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...