Hello community,
here is the log from the commit of package yast2-installation for openSUSE:Factory
checked in at Thu Nov 18 17:52:17 CET 2010.
--------
--- yast2-installation/yast2-installation.changes 2010-09-30 20:12:03.000000000 +0200
+++ yast2-installation/yast2-installation.changes 2010-11-18 16:18:43.000000000 +0100
@@ -1,0 +2,9 @@
+Thu Nov 16 16:13:48 UTC 2010 - jsrain@suse.cz
+
+- fixed behavior of window closing in installation proposal
+ (bnc#636980)
+- use df for estimating partition size for live installer
+ (bnc#555288)
+- 2.20.1
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-installation-2.20.0.tar.bz2
New:
----
yast2-installation-2.20.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-installation.spec ++++++
--- /var/tmp/diff_new_pack.Popy7F/_old 2010-11-18 17:52:04.000000000 +0100
+++ /var/tmp/diff_new_pack.Popy7F/_new 2010-11-18 17:52:04.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-installation (Version 2.20.0)
+# spec file for package yast2-installation (Version 2.20.1)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,11 +19,11 @@
Name: yast2-installation
-Version: 2.20.0
+Version: 2.20.1
Release: 1
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-installation-2.20.0.tar.bz2
+Source0: yast2-installation-2.20.1.tar.bz2
Prefix: /usr
@@ -136,7 +136,7 @@
System installation code as present on installation media.
%prep
-%setup -n yast2-installation-2.20.0
+%setup -n yast2-installation-2.20.1
%build
%{prefix}/bin/y2tool y2autoconf
++++++ yast2-installation-2.20.0.tar.bz2 -> yast2-installation-2.20.1.tar.bz2 ++++++
++++ 17600 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-installation-2.20.0/VERSION new/yast2-installation-2.20.1/VERSION
--- old/yast2-installation-2.20.0/VERSION 2010-09-30 19:34:19.000000000 +0200
+++ new/yast2-installation-2.20.1/VERSION 2010-11-18 17:14:00.000000000 +0100
@@ -1 +1 @@
-2.20.0
+2.20.1
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-installation-2.20.0/configure.in new/yast2-installation-2.20.1/configure.in
--- old/yast2-installation-2.20.0/configure.in 2009-04-28 18:15:57.000000000 +0200
+++ new/yast2-installation-2.20.1/configure.in 2010-11-18 17:17:14.000000000 +0100
@@ -1,9 +1,9 @@
dnl configure.in for yast2-installation
dnl
-dnl -- This file is generated by y2autoconf 2.17.6 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.18.11 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-installation, 2.18.13, http://bugs.opensuse.org/, yast2-installation)
+AC_INIT(yast2-installation, 2.20.1, http://bugs.opensuse.org/, yast2-installation)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -18,7 +18,7 @@
AM_INIT_AUTOMAKE(tar-ustar -Wno-portability)
dnl Important YaST2 variables
-VERSION="2.18.13"
+VERSION="2.20.1"
RPMNAME="yast2-installation"
MAINTAINER="Lukas Ocilka "
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-installation-2.20.0/missing new/yast2-installation-2.20.1/missing
--- old/yast2-installation-2.20.0/missing 2009-04-28 18:16:03.000000000 +0200
+++ new/yast2-installation-2.20.1/missing 2010-11-18 17:17:18.000000000 +0100
@@ -1,10 +1,10 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-scriptversion=2006-05-10.23
+scriptversion=2009-04-28.21; # UTC
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
-# Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
+# 2008, 2009 Free Software Foundation, Inc.
# Originally by Fran,cois Pinard , 1996.
# This program is free software; you can redistribute it and/or modify
@@ -18,9 +18,7 @@
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program. If not, see http://www.gnu.org/licenses/.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
@@ -89,6 +87,9 @@
tar try tar, gnutar, gtar, then tar without non-portable flags
yacc create \`y.tab.[ch]', if possible, from existing .[ch]
+Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
+\`g' are ignored when checking the name.
+
Send bug reports to ."
exit $?
;;
@@ -106,15 +107,22 @@
esac
+# normalize program name to check for.
+program=`echo "$1" | sed '
+ s/^gnu-//; t
+ s/^gnu//; t
+ s/^g//; t'`
+
# 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).
+# the program). This is about non-GNU programs, so use $1 not
+# $program.
case $1 in
- lex|yacc)
+ lex*|yacc*)
# Not GNU programs, they don't have --version.
;;
- tar)
+ tar*)
if test -n "$run"; then
echo 1>&2 "ERROR: \`tar' requires --run"
exit 1
@@ -138,7 +146,7 @@
# If it does not exist, or fails to run (possibly an outdated version),
# try to emulate it.
-case $1 in
+case $program in
aclocal*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
@@ -148,7 +156,7 @@
touch aclocal.m4
;;
- autoconf)
+ autoconf*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified \`${configure_ac}'. You might want to install the
@@ -157,7 +165,7 @@
touch configure
;;
- autoheader)
+ autoheader*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified \`acconfig.h' or \`${configure_ac}'. You might want
@@ -187,7 +195,7 @@
while read f; do touch "$f"; done
;;
- autom4te)
+ autom4te*)
echo 1>&2 "\
WARNING: \`$1' is needed, but is $msg.
You might have modified some files without having the
@@ -210,7 +218,7 @@
fi
;;
- bison|yacc)
+ bison*|yacc*)
echo 1>&2 "\
WARNING: \`$1' $msg. You should only need it if
you modified a \`.y' file. You may need the \`Bison' package
@@ -240,7 +248,7 @@
fi
;;
- lex|flex)
+ lex*|flex*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified a \`.l' file. You may need the \`Flex' package
@@ -263,7 +271,7 @@
fi
;;
- help2man)
+ help2man*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified a dependency of a manual page. You may need the
@@ -277,11 +285,11 @@
else
test -z "$file" || exec >$file
echo ".ab help2man is required to generate this page"
- exit 1
+ exit $?
fi
;;
- makeinfo)
+ makeinfo*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified a \`.texi' or \`.texinfo' file, or any other file
@@ -310,7 +318,7 @@
touch $file
;;
- tar)
+ tar*)
shift
# We have already tried tar in the generic part.
@@ -363,5 +371,6 @@
# eval: (add-hook 'write-file-hooks 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
# End:
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-installation-2.20.0/src/clients/inst_prepareprogress.ycp new/yast2-installation-2.20.1/src/clients/inst_prepareprogress.ycp
--- old/yast2-installation-2.20.0/src/clients/inst_prepareprogress.ycp 2009-06-16 15:21:14.000000000 +0200
+++ new/yast2-installation-2.20.1/src/clients/inst_prepareprogress.ycp 2010-11-18 16:44:53.000000000 +0100
@@ -36,12 +36,25 @@
integer live_size = 0;
if (Mode::live_installation())
{
+
+ string cmd = sformat ("df -P -k %1", "/");
+ y2milestone ("Executing %1", cmd);
+ map out = (map)SCR::Execute (.target.bash_output, cmd);
+ y2milestone ("Output: %1", out);
+ string total_str = out["stdout"]:"";
+ total_str = splitstring(total_str, "\n")[1]:"";
+ live_size = tointeger (filter (string s, splitstring (total_str, " "), {return s != "";})[2]:"0");
+
+/* Using df-based progress estimation, is rather faster
+ may be less precise
+ see bnc#555288
string cmd = sformat ("du -x -B 1024 -s %1", "/");
y2milestone ("Executing %1", cmd);
map out = (map)SCR::Execute (.target.bash_output, cmd);
y2milestone ("Output: %1", out);
string total_str = out["stdout"]:"";
live_size = tointeger (total_str);
+*/
if (live_size == 0)
live_size = 1024*1024; // 1 GB is a good approximation
}
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-installation-2.20.0/src/clients/inst_proposal.ycp new/yast2-installation-2.20.1/src/clients/inst_proposal.ycp
--- old/yast2-installation-2.20.0/src/clients/inst_proposal.ycp 2009-01-23 15:16:12.000000000 +0100
+++ new/yast2-installation-2.20.1/src/clients/inst_proposal.ycp 2010-11-18 12:42:59.000000000 +0100
@@ -7,7 +7,7 @@
* Jiri Srain
* Lukas Ocilka
*
- * $Id: inst_proposal.ycp 54862 2009-01-21 14:29:42Z locilka $
+ * $Id: inst_proposal.ycp 62866 2010-11-18 10:42:59Z jsrain $
*
* Create and display reasonable proposal for basic
* installation and call sub-workflows as required
@@ -1167,7 +1167,11 @@
// Some proposal module can change it while called
SetNextButton();
- input = Wizard::UserInput();
+ input = UI::UserInput();
+
+ if ( input == `accept ) return `next;
+ if ( input == `cancel ) return `abort;
+
y2milestone("Proposal - UserInput: '%1'", input);
richtext_busy_cursor(`id(`proposal ) );
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-installation-2.20.0/src/modules/ImageInstallation.ycp new/yast2-installation-2.20.1/src/modules/ImageInstallation.ycp
--- old/yast2-installation-2.20.0/src/modules/ImageInstallation.ycp 2010-09-30 18:20:26.000000000 +0200
+++ new/yast2-installation-2.20.1/src/modules/ImageInstallation.ycp 2010-11-18 16:44:10.000000000 +0100
@@ -892,12 +892,24 @@
integer progress_start,
integer progress_finish)
{
+ string cmd = sformat ("df -P -k %1", from);
+ y2milestone ("Executing %1", cmd);
+ map out = (map)SCR::Execute (.target.bash_output, cmd);
+ y2milestone ("Output: %1", out);
+ string total_str = out["stdout"]:"";
+ total_str = splitstring(total_str, "\n")[1]:"";
+ integer total_mb = tointeger (filter (string s, splitstring (total_str, " "), {return s != "";})[2]:"0");
+
+/* Using df-based progress estimation, is rather faster
+ may be less precise
+ see bnc#555288
string cmd = sformat ("du -x -B 1048576 -s %1", from);
y2milestone ("Executing %1", cmd);
map out = (map)SCR::Execute (.target.bash_output, cmd);
y2milestone ("Output: %1", out);
string total_str = out["stdout"]:"";
integer total_mb = tointeger (total_str);
+*/
if (total_mb == 0)
total_mb = 1024*1024*1024; // should be big enough
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org