Author: lslezak Date: Wed Apr 8 11:14:05 2009 New Revision: 56678 URL: http://svn.opensuse.org/viewcvs/yast?rev=56678&view=rev Log: - Slideshow fixes - display additional rpm output in the installation log, use installation log summary instead of non-existing y2logRPM file (bnc#456446) - Avoid division by zero when total size to install is less than 1024B (converted to 0kB) Modified: trunk/packager/package/yast2-packager.changes trunk/packager/src/clients/sw_single.ycp trunk/packager/src/modules/PackageInstallation.ycp trunk/packager/src/modules/PackageSlideShow.ycp trunk/packager/src/modules/SlideShowCallbacks.ycp Modified: trunk/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/package/yast2-packager.changes?rev=56678&r1=56677&r2=56678&view=diff ============================================================================== --- trunk/packager/package/yast2-packager.changes (original) +++ trunk/packager/package/yast2-packager.changes Wed Apr 8 11:14:05 2009 @@ -1,4 +1,13 @@ ------------------------------------------------------------------- +Wed Apr 8 10:38:15 CEST 2009 - lslezak@suse.cz + +- Slideshow fixes - display additional rpm output in the + installation log, use installation log summary instead of + non-existing y2logRPM file (bnc#456446) +- Avoid division by zero when total size to install is less than + 1024B (converted to 0kB) + +------------------------------------------------------------------- Fri Apr 3 14:31:20 CEST 2009 - locilka@suse.cz - Adjusting initial repository name according to LABEL in content Modified: trunk/packager/src/clients/sw_single.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/clients/sw_single.ycp?rev=56678&r1=56677&r2=56678&view=diff ============================================================================== --- trunk/packager/src/clients/sw_single.ycp (original) +++ trunk/packager/src/clients/sw_single.ycp Wed Apr 8 11:14:05 2009 @@ -401,6 +401,9 @@ do { + // reset summary + PackagesUI::ResetPackageSummary(); + force_restart = false; list<string> old_failed_packs = []; Modified: trunk/packager/src/modules/PackageInstallation.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/modules/PackageInstallation.ycp?rev=56678&r1=56677&r2=56678&view=diff ============================================================================== --- trunk/packager/src/modules/PackageInstallation.ycp (original) +++ trunk/packager/src/modules/PackageInstallation.ycp Wed Apr 8 11:14:05 2009 @@ -162,9 +162,9 @@ list<string> errpacks = (list<string>) (commit_result[1]:[]); if (size (errpacks) > 0) { - string full_log = (string) SCR::Read (.target.string, Installation::destdir + - Directory::logdir + "/y2logRPM"); + string full_log = PackagesUI::GetPackageSummary()["install_log"]:""; ShowFailedPackages (mergestring (errpacks, "\n"), full_log); + list<string> old_failed_packs = []; if ((integer)SCR::Read (.target.size, "/var/lib/YaST2/failed_packages") > 0) Modified: trunk/packager/src/modules/PackageSlideShow.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/modules/PackageSlideShow.ycp?rev=56678&r1=56677&r2=56678&view=diff ============================================================================== --- trunk/packager/src/modules/PackageSlideShow.ycp (original) +++ trunk/packager/src/modules/PackageSlideShow.ycp Wed Apr 8 11:14:05 2009 @@ -785,7 +785,15 @@ **/ void UpdateTotalProgress(boolean silent_check) { - SlideShow::StageProgress( ( TotalInstalledSize() >> 10 ) * 100 / ( total_size_to_install >> 10 ), nil /*, SlideShow::GetProgressLabel()*/ ); + integer total_size_to_install_kB = total_size_to_install >> 10; + + // avoid division by zero + if (total_size_to_install_kB <= 0) + { + total_size_to_install_kB = 1; + } + + SlideShow::StageProgress( ( TotalInstalledSize() >> 10 ) * 100 / total_size_to_install_kB, nil /*, SlideShow::GetProgressLabel()*/ ); UpdateCurrentCdProgress(silent_check); Modified: trunk/packager/src/modules/SlideShowCallbacks.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/modules/SlideShowCallbacks.ycp?rev=56678&r1=56677&r2=56678&view=diff ============================================================================== --- trunk/packager/src/modules/SlideShowCallbacks.ycp (original) +++ trunk/packager/src/modules/SlideShowCallbacks.ycp Wed Apr 8 11:14:05 2009 @@ -420,6 +420,12 @@ { ret = PackageCallbacks::DonePackage( error, reason ); } + else + { + // put additional rpm output to the installation log + SlideShow::AppendMessageToInstLog(reason); + } + if (size (ret) == 0 || tolower (substring (ret, 0, 1)) != "r") { PackageSlideShow::SlideDisplayDone( -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org