Hello community,
here is the log from the commit of package yast2-ntp-client
checked in at Sun Apr 6 10:40:13 CEST 2008.
--------
--- yast2-ntp-client/yast2-ntp-client.changes 2008-04-03 17:43:29.000000000 +0200
+++ yast2-ntp-client/yast2-ntp-client.changes 2008-04-04 16:26:02.964136000 +0200
@@ -1,0 +2,7 @@
+Fri Apr 4 16:17:14 CEST 2008 - jsuchome@suse.cz
+
+- ntp-client_proposal: UI adapted for fate#302917 (distinguish
+ between one-time synchronization and saving the client config)
+- 2.16.6
+
+-------------------------------------------------------------------
Old:
----
yast2-ntp-client-2.16.5.tar.bz2
New:
----
yast2-ntp-client-2.16.6.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-ntp-client.spec ++++++
--- /var/tmp/diff_new_pack.W10940/_old 2008-04-06 10:39:55.000000000 +0200
+++ /var/tmp/diff_new_pack.W10940/_new 2008-04-06 10:39:55.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-ntp-client (Version 2.16.5)
+# spec file for package yast2-ntp-client (Version 2.16.6)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -12,12 +12,12 @@
Name: yast2-ntp-client
-Version: 2.16.5
+Version: 2.16.6
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-ntp-client-2.16.5.tar.bz2
+Source0: yast2-ntp-client-2.16.6.tar.bz2
Prefix: /usr
BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite
BuildRequires: yast2-country-data
@@ -39,7 +39,7 @@
Lukas Ocilka
%prep
-%setup -n yast2-ntp-client-2.16.5
+%setup -n yast2-ntp-client-2.16.6
%build
%{prefix}/bin/y2tool y2autoconf
@@ -76,6 +76,10 @@
%doc %{prefix}/share/doc/packages/yast2-ntp-client
/usr/share/YaST2/schema/autoyast/rnc/ntpclient.rnc
%changelog
+* Fri Apr 04 2008 jsuchome@suse.cz
+- ntp-client_proposal: UI adapted for fate#302917 (distinguish
+ between one-time synchronization and saving the client config)
+- 2.16.6
* Thu Apr 03 2008 kmachalkova@suse.cz
- Display popup with icon if NTP test succeeds (bnc#306018)
- Require and install ntp packages (instead of obsoleted xntp),
++++++ yast2-ntp-client-2.16.5.tar.bz2 -> yast2-ntp-client-2.16.6.tar.bz2 ++++++
++++ 9391 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-ntp-client-2.16.5/configure.in new/yast2-ntp-client-2.16.6/configure.in
--- old/yast2-ntp-client-2.16.5/configure.in 2007-09-03 16:42:21.000000000 +0200
+++ new/yast2-ntp-client-2.16.6/configure.in 2005-12-19 13:40:44.000000000 +0100
@@ -1,9 +1,9 @@
dnl configure.in for yast2-ntp-client
dnl
-dnl -- This file is generated by y2autoconf 2.15.2 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-ntp-client, 2.15.7, http://bugs.opensuse.org/, yast2-ntp-client)
+AC_INIT(yast2-ntp-client, 2.13.1, http://www.suse.de/feedback, yast2-ntp-client)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -17,9 +17,9 @@
AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs
dnl Important YaST2 variables
-VERSION="2.15.7"
+VERSION="2.13.1"
RPMNAME="yast2-ntp-client"
-MAINTAINER="Katarina Machalkova "
+MAINTAINER="Lukas Ocilka "
dnl pkgconfig honors lib64
pkgconfigdir=\${libdir}/pkgconfig
@@ -110,10 +110,8 @@
AC_MSG_ERROR(xgettext is missing; please install gettext-devel.)
fi
-Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-devtools`
-AC_SUBST(Y2DEVTOOLS_PREFIX)
-devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-devtools`
-devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-devtools`
+devtools_ybindir=`pkg-config --variable=ybindir yast2-devtools`
+devtools_yast2dir=`pkg-config --variable=yast2dir yast2-devtools`
dnl producing pkg-config for others?
AM_CONDITIONAL(CREATE_PKGCONFIG, test "x${CREATE_PKGCONFIG}" != x)
@@ -140,13 +138,6 @@
if test "$YCPMAKEDEP" = "false"; then
AC_MSG_ERROR([ycpmakedep is not installed])
fi
-AC_PATH_PROG(YCPC, ycpc, false, $PATH:$bindir)
-if test "$YCPC" = "false"; then
- AC_MSG_ERROR([ycpc is not installed])
-fi
-AC_CHECK_FILE($devtools_yast2dir/data/testsuite/Makefile.testsuite, [], [
- AC_MSG_WARN([yast2-testsuite.rpm is not installed])
-])
AC_CONFIG_FILES(Makefile agents/Makefile
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-ntp-client-2.16.5/Makefile.am new/yast2-ntp-client-2.16.6/Makefile.am
--- old/yast2-ntp-client-2.16.5/Makefile.am 2007-09-03 16:42:21.000000000 +0200
+++ new/yast2-ntp-client-2.16.6/Makefile.am 2005-12-19 13:40:44.000000000 +0100
@@ -6,8 +6,7 @@
# (Edit ./SUBDIRS instead)
#
-#where devtools are
-Y2TOOL = $(Y2DEVTOOLS_PREFIX)/bin/y2tool
+PREFIX = /usr
VERSION = $(shell cat $(srcdir)/VERSION)
RPMNAME = $(shell cat $(srcdir)/RPMNAME)
@@ -19,7 +18,7 @@
# do we do Makefile.am for devtools? It is a little special...
IS_DEVTOOLS = $(findstring yast2-devtools,$(RPMNAME))
-DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools)
+DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(PREFIX)/share/YaST2/data/devtools)
ALL_PACKAGES = $(DEVTOOLS_DIR)/admin/all-packages
LEGALESE_DIR = $(if $(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl)
@@ -31,10 +30,6 @@
extra_COPYRIGHT_files = $(if $(HAS_YAST_LICENSE), $(COPYRIGHT_files_yast), $(COPYRIGHT_files_gpl))
AUTOMAKE_OPTIONS = foreign dist-bzip2
-# where devtools instal m4 snippets
-# argh, executed literally
-#ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal
-ACLOCAL_AMFLAGS = -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal
Makefile.am.common: $(DEVTOOLS_DIR)/admin/Makefile.am.common
cmp -s $< $@ || cp -f $< $@
@@ -62,11 +57,15 @@
# info '(automake)Conditionals'
if CREATE_PKGCONFIG
+# pkg-config
+# if a package does not have its own pc, copy the generic one
+$(RPMNAME).pc.in: $(DEVTOOLS_DIR)/admin/generic.pc.in
+ test -f $@ || cp -p $< $@
# create the file here instead of by configure
-# because the prerequisite is made here (not anymore!)
+# because the prerequisite is made here
# and we don't want any paths in y2autoconf
# info '(autoconf)config.status Invocation'
-$(RPMNAME).pc: $(RPMNAME).pc.in config.status
+$(RPMNAME).pc: $(RPMNAME).pc.in
./config.status --file=$@:$<
if CREATE_PKGCONFIG_NOARCH
@@ -95,7 +94,7 @@
done
pot:
- $(Y2TOOL) y2makepot -s $(srcdir)
+ y2tool y2makepot -s $(srcdir)
install-pot: pot
@POT_DST=`find -type d -name testsuite -prune , \
@@ -116,7 +115,7 @@
fi
spellcheck: pot
- $(Y2TOOL) pot-spellcheck
+ y2tool pot-spellcheck
# all-local: $(if $(IS_DEVTOOLS),,$(POT_DST))
@@ -143,20 +142,20 @@
rm -f package/*.bak
rm -f package/*.auto
mv $(RPMNAME)-$(VERSION).tar.bz2 package/
- if ! test -x $(Y2TOOL); then \
- echo "$(Y2TOOL): not found."; \
+ if ! test -x $(PREFIX)/bin/y2tool; then \
+ echo "$(PREFIX)/bin/y2tool: not found."; \
echo "You have to install yast2-devtools to making a package"; \
false; \
fi
here=`pwd`; \
cd $(srcdir) && for i in $(RPMNAME)*.spec.in; do \
newname="`echo "$$i" | sed "s/\.in$$//g"`"; \
- $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \
+ $(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 = $(Y2TOOL) tagversion
+TAGVERSION = $(PREFIX)/bin/y2tool tagversion
check-up-to-date check-cvs-up-to-date check-svn-up-to-date:
if [ -d $(srcdir)/CVS ]; then \
@@ -199,13 +198,10 @@
false; \
fi
-check-textdomain:
- $(Y2TOOL) check-textdomain $(srcdir)
-
stable: checkin-stable
checkin-stable: package
- $(Y2TOOL) checkin-stable
+ $(PREFIX)/bin/y2tool checkin-stable
# For po/ modules
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-ntp-client-2.16.5/Makefile.am.common new/yast2-ntp-client-2.16.6/Makefile.am.common
--- old/yast2-ntp-client-2.16.5/Makefile.am.common 2007-09-03 16:42:21.000000000 +0200
+++ new/yast2-ntp-client-2.16.6/Makefile.am.common 2005-12-19 13:40:44.000000000 +0100
@@ -9,7 +9,7 @@
# suffix mapping: info '(make)Static Usage'
# apply only to our modules, not external ones
${ybcfiles}: %.ybc: %.ycp $(ycpchook)
- Y2DIR=$(YCPC_Y2DIR) LD_LIBRARY_PATH=$(YCPC_LD_LIBRARY_PATH) ${YCPC} -c -M. -I. -q $(YCPCFLAGS) $<
+ Y2DIR=$(YCPC_Y2DIR) LD_LIBRARY_PATH=$(YCPC_LD_LIBRARY_PATH) $(bindir)/ycpc -c -M. -I. -q $(YCPCFLAGS) $<
# files to clean
CLEANFILES = ${ybcfiles}
@@ -29,19 +29,7 @@
dist-hook: check-syntax
-CHECK_SYNTAX = true
check-syntax: $(client_DATA) $(ycpchook)
- @if test "$(client_DATA)"; then \
- if $(CHECK_SYNTAX); then \
- TO_CHECK="$(filter %.ycp,$^)"; \
- echo "Checking syntax of $${TO_CHECK}"; \
- if ! $(YCPC) -qE -M. -I. $(YCPCFLAGS) $${TO_CHECK}; then \
- echo "Failed. Disable by 'make ... CHECK_SYNTAX=false' at your own risk"; \
- exit 1; \
- fi; \
- else \
- echo "Syntax check disabled"; \
- fi; \
- fi
+ if test "$(client_DATA)"; then $(bindir)/ycpc -qE -M. -I. $(YCPCFLAGS) $(filter %.ycp,$^) || exit 1; fi
-include .dep
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-ntp-client-2.16.5/missing new/yast2-ntp-client-2.16.6/missing
--- old/yast2-ntp-client-2.16.5/missing 2007-09-03 16:42:27.000000000 +0200
+++ new/yast2-ntp-client-2.16.6/missing 2005-12-19 13:40:48.000000000 +0100
@@ -1,9 +1,9 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-scriptversion=2006-05-10.23
+scriptversion=2005-06-08.21
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
# Free Software Foundation, Inc.
# Originally by Fran,cois Pinard , 1996.
@@ -33,8 +33,6 @@
fi
run=:
-sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
-sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
# In the cases where this matters, `missing' is being run in the
# srcdir already.
@@ -46,7 +44,7 @@
msg="missing on your system"
-case $1 in
+case "$1" in
--run)
# Try to run requested program, and just exit if it succeeds.
run=
@@ -79,7 +77,6 @@
aclocal touch file \`aclocal.m4'
autoconf touch file \`configure'
autoheader touch file \`config.h.in'
- autom4te touch the output file, or create a stub one
automake touch all \`Makefile.in' files
bison create \`y.tab.[ch]', if possible, from existing .[ch]
flex create \`lex.yy.c', if possible, from existing .c
@@ -109,7 +106,7 @@
# Now exit if we have it, but it failed. Also exit now if we
# don't have it and --version was passed (most likely to detect
# the program).
-case $1 in
+case "$1" in
lex|yacc)
# Not GNU programs, they don't have --version.
;;
@@ -138,7 +135,7 @@
# If it does not exist, or fails to run (possibly an outdated version),
# try to emulate it.
-case $1 in
+case "$1" in
aclocal*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
@@ -167,7 +164,7 @@
test -z "$files" && files="config.h"
touch_files=
for f in $files; do
- case $f in
+ case "$f" in
*:*) touch_files="$touch_files "`echo "$f" |
sed -e 's/^[^:]*://' -e 's/:.*//'`;;
*) touch_files="$touch_files $f.in";;
@@ -195,8 +192,8 @@
You can get \`$1' as part of \`Autoconf' from any GNU
archive site."
- file=`echo "$*" | sed -n "$sed_output"`
- test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+ file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
+ test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
if test -f "$file"; then
touch $file
else
@@ -217,25 +214,25 @@
in order for those modifications to take effect. You can get
\`Bison' from any GNU archive site."
rm -f y.tab.c y.tab.h
- if test $# -ne 1; then
+ if [ $# -ne 1 ]; then
eval LASTARG="\${$#}"
- case $LASTARG in
+ case "$LASTARG" in
*.y)
SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
- if test -f "$SRCFILE"; then
+ if [ -f "$SRCFILE" ]; then
cp "$SRCFILE" y.tab.c
fi
SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
- if test -f "$SRCFILE"; then
+ if [ -f "$SRCFILE" ]; then
cp "$SRCFILE" y.tab.h
fi
;;
esac
fi
- if test ! -f y.tab.h; then
+ if [ ! -f y.tab.h ]; then
echo >y.tab.h
fi
- if test ! -f y.tab.c; then
+ if [ ! -f y.tab.c ]; then
echo 'main() { return 0; }' >y.tab.c
fi
;;
@@ -247,18 +244,18 @@
in order for those modifications to take effect. You can get
\`Flex' from any GNU archive site."
rm -f lex.yy.c
- if test $# -ne 1; then
+ if [ $# -ne 1 ]; then
eval LASTARG="\${$#}"
- case $LASTARG in
+ case "$LASTARG" in
*.l)
SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
- if test -f "$SRCFILE"; then
+ if [ -f "$SRCFILE" ]; then
cp "$SRCFILE" lex.yy.c
fi
;;
esac
fi
- if test ! -f lex.yy.c; then
+ if [ ! -f lex.yy.c ]; then
echo 'main() { return 0; }' >lex.yy.c
fi
;;
@@ -270,9 +267,11 @@
\`Help2man' package in order for those modifications to take
effect. You can get \`Help2man' from any GNU archive site."
- file=`echo "$*" | sed -n "$sed_output"`
- test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
- if test -f "$file"; then
+ file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+ if test -z "$file"; then
+ file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
+ fi
+ if [ -f "$file" ]; then
touch $file
else
test -z "$file" || exec >$file
@@ -290,17 +289,11 @@
DU, IRIX). You might want to install the \`Texinfo' package or
the \`GNU make' package. Grab either from any GNU archive site."
# The file to touch is that specified with -o ...
- file=`echo "$*" | sed -n "$sed_output"`
- test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+ file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
if test -z "$file"; then
# ... or it is the one specified with @setfilename ...
infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
- file=`sed -n '
- /^@setfilename/{
- s/.* \([^ ]*\) *$/\1/
- p
- q
- }' $infile`
+ file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile`
# ... or it is derived from the source name (dir/f.texi becomes f.info)
test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
fi
@@ -324,13 +317,13 @@
fi
firstarg="$1"
if shift; then
- case $firstarg in
+ case "$firstarg" in
*o*)
firstarg=`echo "$firstarg" | sed s/o//`
tar "$firstarg" "$@" && exit 0
;;
esac
- case $firstarg in
+ case "$firstarg" in
*h*)
firstarg=`echo "$firstarg" | sed s/h//`
tar "$firstarg" "$@" && exit 0
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-ntp-client-2.16.5/src/ntp-client_proposal.ycp new/yast2-ntp-client-2.16.6/src/ntp-client_proposal.ycp
--- old/yast2-ntp-client-2.16.5/src/ntp-client_proposal.ycp 2008-04-03 16:59:39.000000000 +0200
+++ new/yast2-ntp-client-2.16.6/src/ntp-client_proposal.ycp 2008-04-04 15:52:58.000000000 +0200
@@ -8,16 +8,14 @@
{
textdomain "ntp-client";
+
import "Address";
import "NetworkService";
import "NtpClient";
import "Service";
import "String";
import "Stage";
-import "Package";
-import "Packages";
import "PackageSystem";
-import "Pkg";
import "Popup";
import "Report";
@@ -86,22 +84,30 @@
if (func == "CreateUI")
{
- term cont =
- `Left ( `VBox(
- `VSpacing (0.5),
- `HBox (
- `HSpacing (3),
- `ComboBox (`id (`ntp_address), `opt (`editable),
- // combo box label
- _("NTP Server Address")
- ),
- `VBox (
- `Label (""),
- // push button label
- `PushButton (`id (`ntp_configure), _("Configure..."))
- )
- )
- ));
+ term cont = `VBox (`VSpacing (0.5), `HBox (
+ `HSpacing (3),
+ `HWeight (1, `VBox (
+ `Left (`ComboBox (`id (`ntp_address), `opt (`editable, `hstretch),
+ // combo box label
+ _("NTP Server Address")
+ )),
+ `VSpacing (0.3),
+ `HBox (
+ `HSpacing (0.5),
+ // check box label
+ `Left (`CheckBox (`id (`ntp_save), _("Save NTP Configuration")))
+ )
+ )),
+ `HWeight (1, `VBox (
+ `Label (""),
+ `VSpacing (0.3), // try to line up the widgets horizontally
+ // push button label
+ `Left (`PushButton (`id (`ntp_now), _("Synchronize now"))),
+ `VSpacing (0.3),
+ // push button label
+ `Left (`PushButton (`id (`ntp_configure), _("Configure...")))
+ ))
+ ));
if (UI::WidgetExists(`id(`rp)))
{
@@ -112,24 +118,27 @@
y2warning("Network is not running, NTP synchronization will not be available");
UI::ChangeWidget(`id(`ntp_content), `Enabled, false);
}
-
- //OK, let's remove this, ntp package is available even on 1CD media so we don't need
- //to check if it is available to prevent repository scanning windows from popping up
- //(#327336, c#21)
-
- //if ( ( Stage::initial() || !Package::Installed("ntp") ) && !Package::Available("ntp") )
- //{
- // y2warning("ntp package is not installable, NTP synchronization will not be available");
- // UI::ChangeWidget(`id(`ntp_content), `Enabled, false);
- //}
}
ret = true;
}
+else if (func == "GetNTPEnabled")
+{
+ ret = Service::Enabled (NtpClient::service_name);
+}
+
+
else if (func == "GetUseNTP")
{
- ret = NtpClient::ntp_selected;
+ /*
+ if (param["first_time"]:false && !Stage::initial ())
+ {
+ ret = Service::Enabled (NtpClient::service_name);
+ }
+ else
+ */
+ ret = NtpClient::ntp_selected;
}
else if (func == "SetUseNTP")
@@ -147,7 +156,6 @@
else if (func == "Write")
{
string ntp_server = (string) UI::QueryWidget(`id(`ntp_address), `Value);
- boolean write_settings = param["write_settings"]:false;
boolean ntpdate_only = param["ntpdate_only"]:false;
if ( !ValidateSingleServer( ntp_server ) )
@@ -161,6 +169,8 @@
//(ntpdate is in inst-sys so we don't need the package)
if (Stage::initial() && !ntpdate_only)
{
+ import "Package";
+ import "Packages";
if (Package::Available(required_package))
{
Packages::addAdditionalPackage(required_package);
@@ -171,7 +181,7 @@
}
}
//Otherwise, prompt user for confirming pkg installation
- else
+ else if (!Stage::initial ())
{
if (!PackageSystem::CheckAndInstallPackages([ required_package ]))
{
@@ -181,7 +191,7 @@
}
integer status = -1;
- string service_name = "ntp";
+ string service_name = NtpClient::service_name;
//Stop NTP service on running system (during 1st stage, we don't care)
if( !Stage::initial())
@@ -209,9 +219,7 @@
{
ret = `success;
- //User wants more than running ntpdate
- //(I hate this, it's overly complicated, but some
- //things are just not explainable)
+ // User wants to more than running ntpdate (synchronize on boot)
if (!ntpdate_only)
{
NtpClient::modified = true;
@@ -221,8 +229,7 @@
//In inst-sys we don't need to care further
//ntp-client_finish will do the job
//In installed system we must write the settings
-
- if ( !Stage::initial() /*&& write_settings*/)
+ if (!Stage::initial())
NtpClient::Write();
}
}
@@ -242,7 +249,9 @@
{
string ntp_server = (string) UI::QueryWidget(`id(`ntp_address), `Value);
AddSingleServer(ntp_server);
- ret = (symbol) WFM::CallFunction("ntp-client");
+ boolean retval = (boolean) WFM::CallFunction("ntp-client");
+ if (retval)
+ ret = `next;
ProposeSomething();
}
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-ntp-client-2.16.5/VERSION new/yast2-ntp-client-2.16.6/VERSION
--- old/yast2-ntp-client-2.16.5/VERSION 2008-04-03 17:38:50.000000000 +0200
+++ new/yast2-ntp-client-2.16.6/VERSION 2008-04-04 16:20:15.000000000 +0200
@@ -1 +1 @@
-2.16.5
+2.16.6
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org