Hello community,
here is the log from the commit of package yast2-installation for openSUSE:Factory
checked in at Fri Jun 12 18:01:04 CEST 2009.
--------
--- yast2-installation/yast2-installation.changes 2009-06-08 14:20:48.000000000 +0200
+++ yast2-installation/yast2-installation.changes 2009-06-11 13:39:55.000000000 +0200
@@ -1,0 +2,7 @@
+Thu Jun 11 12:57:14 CEST 2009 - jsrain@suse.cz
+
+- adapted for unified progress during live installation
+ (bnc#435680)
+- 2.18.17
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-installation-2.18.16.tar.bz2
New:
----
yast2-installation-2.18.17.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-installation.spec ++++++
--- /var/tmp/diff_new_pack.a16505/_old 2009-06-12 18:00:36.000000000 +0200
+++ /var/tmp/diff_new_pack.a16505/_new 2009-06-12 18:00:36.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-installation (Version 2.18.16)
+# spec file for package yast2-installation (Version 2.18.17)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,12 +19,12 @@
Name: yast2-installation
-Version: 2.18.16
+Version: 2.18.17
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-installation-2.18.16.tar.bz2
+Source0: yast2-installation-2.18.17.tar.bz2
Prefix: /usr
BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files yast2-core-devel yast2-devtools yast2-testsuite
# xmllint
@@ -123,7 +123,7 @@
Lukas Ocilka
%prep
-%setup -n yast2-installation-2.18.16
+%setup -n yast2-installation-2.18.17
%build
%{prefix}/bin/y2tool y2autoconf
@@ -193,6 +193,10 @@
%exclude %{prefix}/share/doc/packages/yast2-installation/COPYING
%exclude %{prefix}/share/doc/packages/yast2-installation/README
%changelog
+* Thu Jun 11 2009 jsrain@suse.cz
+- adapted for unified progress during live installation
+ (bnc#435680)
+- 2.18.17
* Mon Jun 08 2009 aschnell@suse.de
- use minimalistic xorg.conf during installation (bnc #510015)
- 2.18.16
++++++ yast2-installation-2.18.16.tar.bz2 -> yast2-installation-2.18.17.tar.bz2 ++++++
++++ 3037 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.18.16/configure.in new/yast2-installation-2.18.17/configure.in
--- old/yast2-installation-2.18.16/configure.in 2009-06-08 14:04:37.000000000 +0200
+++ new/yast2-installation-2.18.17/configure.in 2009-06-11 13:38:53.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.18.5 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-installation, 2.18.16, http://bugs.opensuse.org/, yast2-installation)
+AC_INIT(yast2-installation, 2.18.17, 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.16"
+VERSION="2.18.17"
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.18.16/src/clients/inst_prepareprogress.ycp new/yast2-installation-2.18.17/src/clients/inst_prepareprogress.ycp
--- old/yast2-installation-2.18.16/src/clients/inst_prepareprogress.ycp 2009-04-30 15:14:24.000000000 +0200
+++ new/yast2-installation-2.18.17/src/clients/inst_prepareprogress.ycp 2009-06-11 12:26:14.000000000 +0200
@@ -33,6 +33,19 @@
ImageInstallation::FillUpImagesDetails();
}
+ integer live_size = 0;
+ if (Mode::live_installation())
+ {
+ 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
+ }
+
list< map > stages = [
$[
"name" : "disk",
@@ -45,7 +58,7 @@
"description": _("Deploying Images..."),
// Use 'zero' if image installation is not used
// BNC #439104
- "value" : (Installation::image_installation ? ImageInstallation::TotalSize() / 1024 : 0), // kilobytes
+ "value" : live_size > 0 ? live_size : (Installation::image_installation ? ImageInstallation::TotalSize() / 1024 : 0), // kilobytes
"units" : `kb,
],
$[
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.18.16/src/modules/ImageInstallation.ycp new/yast2-installation-2.18.17/src/modules/ImageInstallation.ycp
--- old/yast2-installation-2.18.16/src/modules/ImageInstallation.ycp 2009-04-30 15:14:24.000000000 +0200
+++ new/yast2-installation-2.18.17/src/modules/ImageInstallation.ycp 2009-06-11 12:00:27.000000000 +0200
@@ -939,8 +939,9 @@
if (done != nil)
{
integer progress = progress_start + (progress_finish - progress_start) * tointeger (done) / total_mb / 1024 / 1024;
- Progress::Step (progress);
y2debug ("Setting progress to %1", progress);
+ SlideShow::StageProgress( progress, nil);
+ SlideShow::SubProgress( (progress_finish - progress_start) * tointeger (done) / total_mb / 1024 / 1024, nil);
}
}
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.18.16/VERSION new/yast2-installation-2.18.17/VERSION
--- old/yast2-installation-2.18.16/VERSION 2009-06-08 14:03:23.000000000 +0200
+++ new/yast2-installation-2.18.17/VERSION 2009-06-11 12:57:36.000000000 +0200
@@ -1 +1 @@
-2.18.16
+2.18.17
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org