Hello community,
here is the log from the commit of package yast2-ntp-client
checked in at Fri Sep 21 11:58:39 CEST 2007.
--------
--- yast2-ntp-client/yast2-ntp-client.changes 2007-09-13 18:29:35.000000000 +0200
+++ /mounts/work_src_done/NOARCH/yast2-ntp-client/yast2-ntp-client.changes 2007-09-21 11:36:11.000000000 +0200
@@ -1,0 +2,16 @@
+Fri Sep 21 11:33:24 CEST 2007 - locilka@suse.cz
+
+- When user selects to use NTP during installation, trigger also
+ yast2-ntp-client RPM for installation (#327050).
+- 2.15.12
+
+-------------------------------------------------------------------
+Thu Sep 20 18:11:22 CEST 2007 - kmachalkova@suse.cz
+
+- Do not write NTP configuration at the end of 1st stage of
+ installation if it hasn't been modified (#326338)
+- Set write_only mode at the end of 1st stage, do not start NTP
+ service (#326478 related)
+- 2.15.11
+
+-------------------------------------------------------------------
Old:
----
yast2-ntp-client-2.15.10.tar.bz2
New:
----
yast2-ntp-client-2.15.12.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-ntp-client.spec ++++++
--- /var/tmp/diff_new_pack.h30380/_old 2007-09-21 11:58:27.000000000 +0200
+++ /var/tmp/diff_new_pack.h30380/_new 2007-09-21 11:58:27.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-ntp-client (Version 2.15.10)
+# spec file for package yast2-ntp-client (Version 2.15.12)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,18 +11,18 @@
# norootforbuild
Name: yast2-ntp-client
-Version: 2.15.10
+Version: 2.15.12
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-ntp-client-2.15.10.tar.bz2
-prefix: /usr
+Source0: yast2-ntp-client-2.15.12.tar.bz2
+Prefix: /usr
BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite
#SLPAPI.pm
Requires: yast2 >= 2.15.17
Requires: yast2-country
-BuildArchitectures: noarch
+BuildArch: noarch
Summary: YaST2 - NTP Client Configuration
%description
@@ -36,7 +36,7 @@
Lukas Ocilka
%prep
-%setup -n yast2-ntp-client-2.15.10
+%setup -n yast2-ntp-client-2.15.12
%build
%{prefix}/bin/y2tool y2autoconf
@@ -72,8 +72,17 @@
/usr/share/YaST2/data/ntp_servers.ycp
%doc %{prefix}/share/doc/packages/yast2-ntp-client
/usr/share/YaST2/schema/autoyast/rnc/ntpclient.rnc
-
%changelog
+* Fri Sep 21 2007 - locilka@suse.cz
+- When user selects to use NTP during installation, trigger also
+ yast2-ntp-client RPM for installation (#327050).
+- 2.15.12
+* Thu Sep 20 2007 - kmachalkova@suse.cz
+- Do not write NTP configuration at the end of 1st stage of
+ installation if it hasn't been modified (#326338)
+- Set write_only mode at the end of 1st stage, do not start NTP
+ service (#326478 related)
+- 2.15.11
* Thu Sep 13 2007 - kmachalkova@suse.cz
- In installation proposal, remember whether synchronization with
NTP server has been selected (#308238)
++++++ yast2-ntp-client-2.15.10.tar.bz2 -> yast2-ntp-client-2.15.12.tar.bz2 ++++++
++++ 3458 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.15.10/configure.in new/yast2-ntp-client-2.15.12/configure.in
--- old/yast2-ntp-client-2.15.10/configure.in 2007-09-03 16:42:21.000000000 +0200
+++ new/yast2-ntp-client-2.15.12/configure.in 2007-08-23 17:41:15.000000000 +0200
@@ -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 2.15.7 - 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.15.6, 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.7"
+VERSION="2.15.6"
RPMNAME="yast2-ntp-client"
MAINTAINER="Katarina Machalkova "
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.15.10/Makefile.am new/yast2-ntp-client-2.15.12/Makefile.am
--- old/yast2-ntp-client-2.15.10/Makefile.am 2007-09-03 16:42:21.000000000 +0200
+++ new/yast2-ntp-client-2.15.12/Makefile.am 2007-08-23 17:41:15.000000000 +0200
@@ -210,8 +210,7 @@
# For po/ modules
checkpo:
- test ! -d $(srcdir)/po || $(MAKE) -C po checkpo
-# test ! -d $(srcdir)/po \
-# || { $(MAKE) -C po checkpo && $(MAKE) -C po make-pox; }
+ test ! -f $(srcdir)/po/Makefile || $(MAKE) -C po checkpo
+# test ! -f $(srcdir)/po/Makefile || $(MAKE) -C po checkpo make-pox
# No ./SUBDIRS file found - assuming default: All direct subdirs with Makefile.am
SUBDIRS = agents data doc src testsuite
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.15.10/missing new/yast2-ntp-client-2.15.12/missing
--- old/yast2-ntp-client-2.15.10/missing 2007-09-03 16:42:27.000000000 +0200
+++ new/yast2-ntp-client-2.15.12/missing 2007-08-23 17:41:21.000000000 +0200
@@ -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.15.10/src/ntp-client_finish.ycp new/yast2-ntp-client-2.15.12/src/ntp-client_finish.ycp
--- old/yast2-ntp-client-2.15.10/src/ntp-client_finish.ycp 2007-08-31 15:17:15.000000000 +0200
+++ new/yast2-ntp-client-2.15.12/src/ntp-client_finish.ycp 2007-09-21 10:03:43.000000000 +0200
@@ -31,7 +31,7 @@
"steps" : 1,
// progress step title
"title" : _("Writing NTP Configuration..."),
- "when" : [ `installation, `autoinst ],
+ "when" : NtpClient::modified ? [ `installation, `autoinst ] : [],
];
}
else if (func == "Write")
@@ -42,6 +42,8 @@
NtpClient::Import( ex );
+ NtpClient::write_only = true;
+
NtpClient::Write();
}
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.15.10/src/ntp-client_proposal.ycp new/yast2-ntp-client-2.15.12/src/ntp-client_proposal.ycp
--- old/yast2-ntp-client-2.15.10/src/ntp-client_proposal.ycp 2007-09-12 19:06:06.000000000 +0200
+++ new/yast2-ntp-client-2.15.12/src/ntp-client_proposal.ycp 2007-09-21 11:19:49.000000000 +0200
@@ -163,7 +163,14 @@
}
//Schedule package for installation
- Packages::addAdditionalPackage("xntp");
+ if (Package::Available("xntp"))
+ // FIXME: later use
+ // if (Package::Available("xntp")) { Packages::addAdditionalPackage("xntp"); }
+ Packages::addAdditionalPackage("xntp");
+ // bugzilla #327050
+ // Agent for writing /etc/ntp.conf needs to be installed
+ // to write the settings at the end of the installation
+ Packages::addAdditionalPackage("yast2-ntp-client");
integer r = (integer) SCR::Execute (.target.bash, sformat ("/usr/sbin/ntpdate '%1'", String::Quote(ntp_server)));
y2milestone ("'ntpdate %1' returned %2", ntp_server, r);
@@ -177,6 +184,7 @@
if (r == 0)
{
ret = `success;
+ NtpClient::modified = true;
AddSingleServer(ntp_server);
}
else
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.15.10/VERSION new/yast2-ntp-client-2.15.12/VERSION
--- old/yast2-ntp-client-2.15.10/VERSION 2007-09-13 18:14:39.000000000 +0200
+++ new/yast2-ntp-client-2.15.12/VERSION 2007-09-21 11:33:20.000000000 +0200
@@ -1 +1 @@
-2.15.10
+2.15.12
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org