Author: jsrain Date: Thu Jun 11 13:38:37 2009 New Revision: 57528 URL: http://svn.opensuse.org/viewcvs/yast?rev=57528&view=rev Log: adapted for unified progress during live installation (bnc#435680) Modified: trunk/installation/VERSION trunk/installation/package/yast2-installation.changes trunk/installation/src/clients/inst_prepareprogress.ycp trunk/installation/src/modules/ImageInstallation.ycp Modified: trunk/installation/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/VERSION?rev=57528&r1=57527&r2=57528&view=diff ============================================================================== --- trunk/installation/VERSION (original) +++ trunk/installation/VERSION Thu Jun 11 13:38:37 2009 @@ -1 +1 @@ -2.18.16 +2.18.17 Modified: trunk/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-installation.changes?rev=57528&r1=57527&r2=57528&view=diff ============================================================================== --- trunk/installation/package/yast2-installation.changes (original) +++ trunk/installation/package/yast2-installation.changes Thu Jun 11 13:38:37 2009 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Jun 11 12:57:14 CEST 2009 - jsrain@suse.cz + +- adapted for unified progress during live installation + (bnc#435680) +- 2.18.17 + +------------------------------------------------------------------- Mon Jun 08 14:03:30 CEST 2009 - aschnell@suse.de - use minimalistic xorg.conf during installation (bnc #510015) Modified: trunk/installation/src/clients/inst_prepareprogress.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/inst_prepareprogress.ycp?rev=57528&r1=57527&r2=57528&view=diff ============================================================================== --- trunk/installation/src/clients/inst_prepareprogress.ycp (original) +++ trunk/installation/src/clients/inst_prepareprogress.ycp Thu Jun 11 13:38:37 2009 @@ -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, ], $[ Modified: trunk/installation/src/modules/ImageInstallation.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/modules/ImageInstallation.ycp?rev=57528&r1=57527&r2=57528&view=diff ============================================================================== --- trunk/installation/src/modules/ImageInstallation.ycp (original) +++ trunk/installation/src/modules/ImageInstallation.ycp Thu Jun 11 13:38:37 2009 @@ -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); } } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org