Hello community,
here is the log from the commit of package yast2-ntp-client
checked in at Fri Oct 5 00:31:18 CEST 2007.
--------
--- yast2-ntp-client/yast2-ntp-client.changes 2007-09-21 11:36:11.000000000 +0200
+++ /mounts/work_src_done/NOARCH/yast2-ntp-client/yast2-ntp-client.changes 2007-10-03 19:01:07.948843000 +0200
@@ -1,0 +2,10 @@
+Wed Oct 3 18:44:06 CEST 2007 - kmachalkova@suse.cz
+
+- Added visual progress feedback for running ntpdate in installation
+ proposal (#328469)
+- Hide read/write progress in installation (#327066)
+- Do not check for availability of xntp package (thus, update all
+ the repos) if it is already installed (#327336)
+- 2.16.0
+
+-------------------------------------------------------------------
Old:
----
yast2-ntp-client-2.15.12.tar.bz2
New:
----
yast2-ntp-client-2.16.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-ntp-client.spec ++++++
--- /var/tmp/diff_new_pack.c27795/_old 2007-10-05 00:30:57.000000000 +0200
+++ /var/tmp/diff_new_pack.c27795/_new 2007-10-05 00:30:57.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-ntp-client (Version 2.15.12)
+# spec file for package yast2-ntp-client (Version 2.16.0)
#
# 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.12
+Version: 2.16.0
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-ntp-client-2.15.12.tar.bz2
+Source0: yast2-ntp-client-2.16.0.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.12
+%setup -n yast2-ntp-client-2.16.0
%build
%{prefix}/bin/y2tool y2autoconf
@@ -73,6 +73,13 @@
%doc %{prefix}/share/doc/packages/yast2-ntp-client
/usr/share/YaST2/schema/autoyast/rnc/ntpclient.rnc
%changelog
+* Wed Oct 03 2007 - kmachalkova@suse.cz
+- Added visual progress feedback for running ntpdate in installation
+ proposal (#328469)
+- Hide read/write progress in installation (#327066)
+- Do not check for availability of xntp package (thus, update all
+ the repos) if it is already installed (#327336)
+- 2.16.0
* Fri Sep 21 2007 - locilka@suse.cz
- When user selects to use NTP during installation, trigger also
yast2-ntp-client RPM for installation (#327050).
++++++ yast2-ntp-client-2.15.12.tar.bz2 -> yast2-ntp-client-2.16.0.tar.bz2 ++++++
++++ 3605 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.12/configure.in new/yast2-ntp-client-2.16.0/configure.in
--- old/yast2-ntp-client-2.15.12/configure.in 2007-08-23 17:41:15.000000000 +0200
+++ new/yast2-ntp-client-2.16.0/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.7 - 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.6, 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.6"
+VERSION="2.15.7"
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.12/Makefile.am new/yast2-ntp-client-2.16.0/Makefile.am
--- old/yast2-ntp-client-2.15.12/Makefile.am 2007-08-23 17:41:15.000000000 +0200
+++ new/yast2-ntp-client-2.16.0/Makefile.am 2007-09-03 16:42:21.000000000 +0200
@@ -210,7 +210,8 @@
# For po/ modules
checkpo:
- test ! -f $(srcdir)/po/Makefile || $(MAKE) -C po checkpo
-# test ! -f $(srcdir)/po/Makefile || $(MAKE) -C po checkpo make-pox
+ test ! -d $(srcdir)/po || $(MAKE) -C po checkpo
+# test ! -d $(srcdir)/po \
+# || { $(MAKE) -C po checkpo && $(MAKE) -C po 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.12/missing new/yast2-ntp-client-2.16.0/missing
--- old/yast2-ntp-client-2.15.12/missing 2007-08-23 17:41:21.000000000 +0200
+++ new/yast2-ntp-client-2.16.0/missing 2007-09-03 16:42:27.000000000 +0200
@@ -1,9 +1,9 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-scriptversion=2005-06-08.21
+scriptversion=2006-05-10.23
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
# Free Software Foundation, Inc.
# Originally by Fran,cois Pinard , 1996.
@@ -33,6 +33,8 @@
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.
@@ -44,7 +46,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=
@@ -77,6 +79,7 @@
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
@@ -106,7 +109,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.
;;
@@ -135,7 +138,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
@@ -164,7 +167,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";;
@@ -192,8 +195,8 @@
You can get \`$1' as part of \`Autoconf' from any GNU
archive site."
- file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
- test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -f "$file"; then
touch $file
else
@@ -214,25 +217,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 [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.y)
SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.c
fi
SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.h
fi
;;
esac
fi
- if [ ! -f y.tab.h ]; then
+ if test ! -f y.tab.h; then
echo >y.tab.h
fi
- if [ ! -f y.tab.c ]; then
+ if test ! -f y.tab.c; then
echo 'main() { return 0; }' >y.tab.c
fi
;;
@@ -244,18 +247,18 @@
in order for those modifications to take effect. You can get
\`Flex' from any GNU archive site."
rm -f lex.yy.c
- if [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.l)
SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" lex.yy.c
fi
;;
esac
fi
- if [ ! -f lex.yy.c ]; then
+ if test ! -f lex.yy.c; then
echo 'main() { return 0; }' >lex.yy.c
fi
;;
@@ -267,11 +270,9 @@
\`Help2man' package in order for those modifications to take
effect. You can get \`Help2man' from any GNU archive site."
- 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
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+ if test -f "$file"; then
touch $file
else
test -z "$file" || exec >$file
@@ -289,11 +290,17 @@
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 's/.*-o \([^ ]*\).*/\1/p'`
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
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
@@ -317,13 +324,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.12/src/ntp-client_proposal.ycp new/yast2-ntp-client-2.16.0/src/ntp-client_proposal.ycp
--- old/yast2-ntp-client-2.15.12/src/ntp-client_proposal.ycp 2007-09-21 11:19:49.000000000 +0200
+++ new/yast2-ntp-client-2.16.0/src/ntp-client_proposal.ycp 2007-10-02 11:19:44.000000000 +0200
@@ -17,6 +17,7 @@
import "Package";
import "Packages";
import "Pkg";
+import "Popup";
y2milestone("----------------------------------------");
y2milestone("Ntp client proposal started");
@@ -113,7 +114,12 @@
}
//does not really work ideally, need something better pkg binding :(
- if (!Package::Available("xntp"))
+ //Check availability of xntp package
+ //case 1: installation 1st stage - Package::Installed() does not work here
+ // so let's check for the pkg availability only
+ //case 2: running system - check for pkg availability iff it is not
+ // already installed (#328469)
+ if ( ( Stage::initial() || !Package::Installed("xntp") ) && !Package::Available("xntp") )
{
y2warning("xntp package is not installable, NTP synchronization will not be available");
UI::ChangeWidget(`id(`ntp_content), `Enabled, false);
@@ -147,6 +153,7 @@
ret = `invalid_hostname;
else
{
+ Popup::ShowFeedback("", _("Synchronizing with NTP server..."));
y2milestone("Running ntpdate to sync with %1", ntp_server);
integer status = -1;
@@ -174,6 +181,7 @@
integer r = (integer) SCR::Execute (.target.bash, sformat ("/usr/sbin/ntpdate '%1'", String::Quote(ntp_server)));
y2milestone ("'ntpdate %1' returned %2", ntp_server, r);
+ Popup::ClearFeedback();
if( !Stage::initial())
{
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.12/src/NtpClient.ycp new/yast2-ntp-client-2.16.0/src/NtpClient.ycp
--- old/yast2-ntp-client-2.15.12/src/NtpClient.ycp 2007-09-13 18:16:34.000000000 +0200
+++ new/yast2-ntp-client-2.16.0/src/NtpClient.ycp 2007-10-03 18:18:40.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Data for configuration of ntp-client, input and output functions.
* Authors: Jiri Srain
*
- * $Id: NtpClient.ycp 40895 2007-09-13 15:48:17Z kmachalkova $
+ * $Id: NtpClient.ycp 41245 2007-10-03 16:18:40Z kmachalkova $
*
* Representation of the configuration of ntp-client.
* Input and output routines.
@@ -405,26 +405,32 @@
integer steps = 2;
integer sl = 500;
+
+ boolean have_progress = (Mode::normal());
+
// We do not set help text here, because it was set outside
- Progress::New( caption, " ", steps, [
- // progress stage
- _("Read network configuration"),
- // progress stage
- _("Read NTP settings"),
- ], [
- // progress step
- _("Reading network configuration..."),
- // progress step
- _("Reading NTP settings..."),
- // progress step
- _("Finished")
- ],
- ""
- );
+ if ( have_progress )
+ {
+ Progress::New( caption, " ", steps, [
+ // progress stage
+ _("Read network configuration"),
+ // progress stage
+ _("Read NTP settings"),
+ ], [
+ // progress step
+ _("Reading network configuration..."),
+ // progress step
+ _("Reading NTP settings..."),
+ // progress step
+ _("Finished")
+ ],
+ ""
+ );
+ }
// read network configuration
if(Abort()) return false;
- Progress::NextStage();
+ if (have_progress) Progress::NextStage();
boolean progress_orig = Progress::set (false);
NetworkDevices::Read ();
@@ -436,7 +442,7 @@
GetCountryNames ();
// read current settings
if(Abort()) return false;
- Progress::NextStage();
+ if (have_progress) Progress::NextStage();
boolean failed = false;
@@ -521,8 +527,11 @@
}
if(Abort()) return false;
- Progress::NextStage ();
- Progress::Title (_("Finished"));
+ if (have_progress)
+ {
+ Progress::NextStage ();
+ Progress::Title (_("Finished"));
+ }
sleep(sl);
if(Abort()) return false;
@@ -658,26 +667,31 @@
integer sl = 0;
sleep(sl);
+ boolean have_progress = (Mode::normal());
+
// We do not set help text here, because it was set outside
- Progress::New(caption, " ", steps, [
- // progress stage
- _("Write NTP settings"),
- // progress stage
- _("Restart NTP daemon")
- ], [
- // progress step
- _("Writing the settings..."),
- // progress step
- _("Restarting NTP daemon..."),
- // progress step
- _("Finished")
- ],
- ""
- );
+ if ( have_progress )
+ {
+ Progress::New(caption, " ", steps, [
+ // progress stage
+ _("Write NTP settings"),
+ // progress stage
+ _("Restart NTP daemon")
+ ], [
+ // progress step
+ _("Writing the settings..."),
+ // progress step
+ _("Restarting NTP daemon..."),
+ // progress step
+ _("Finished")
+ ],
+ ""
+ );
+ }
// write settings
if(Abort()) return false;
- Progress::NextStage();
+ if ( have_progress ) Progress::NextStage();
if (update_dhcp)
{
@@ -799,7 +813,7 @@
// restart daemon
if(Abort()) return false;
- Progress::NextStage ();
+ if (have_progress) Progress::NextStage ();
// if (change_firewall)
// {
@@ -829,8 +843,11 @@
sleep(sl);
if(Abort()) return false;
- Progress::NextStage ();
- Progress::Title (_("Finished"));
+ if ( have_progress )
+ {
+ Progress::NextStage ();
+ Progress::Title (_("Finished"));
+ }
sleep(sl);
if(Abort()) return false;
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.12/VERSION new/yast2-ntp-client-2.16.0/VERSION
--- old/yast2-ntp-client-2.15.12/VERSION 2007-09-21 11:33:20.000000000 +0200
+++ new/yast2-ntp-client-2.16.0/VERSION 2007-10-03 18:54:26.000000000 +0200
@@ -1 +1 @@
-2.15.12
+2.16.0
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org