Hello community, here is the log from the commit of package yast2-packager for openSUSE:Factory checked in at Wed Nov 10 22:04:47 CET 2010. -------- --- yast2-packager/yast2-packager.changes 2010-11-03 14:50:31.000000000 +0100 +++ yast2-packager/yast2-packager.changes 2010-11-10 18:58:41.000000000 +0100 @@ -1,0 +2,10 @@ +Wed Nov 10 17:20:53 UTC 2010 - lslezak@suse.cz + +- update the number of the remaining packages when package + installation is finished, display it at the beginning + (bnc#473822) +- reset the list of packages so the next run displays correct + values (used when PKGMGR_ACTION_AT_EXIT == "summary") +- 2.20.10 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-packager-2.20.9.tar.bz2 New: ---- yast2-packager-2.20.10.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-packager.spec ++++++ --- /var/tmp/diff_new_pack.QNM2r7/_old 2010-11-10 22:03:34.000000000 +0100 +++ /var/tmp/diff_new_pack.QNM2r7/_new 2010-11-10 22:03:34.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yast2-packager (Version 2.20.9) +# spec file for package yast2-packager (Version 2.20.10) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,11 +19,11 @@ Name: yast2-packager -Version: 2.20.9 +Version: 2.20.10 Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-packager-2.20.9.tar.bz2 +Source0: yast2-packager-2.20.10.tar.bz2 Prefix: /usr @@ -100,7 +100,7 @@ (webpin) and installing them via OneClickInstall %prep -%setup -n yast2-packager-2.20.9 +%setup -n yast2-packager-2.20.10 %build %{prefix}/bin/y2tool y2autoconf ++++++ yast2-packager-2.20.9.tar.bz2 -> yast2-packager-2.20.10.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-2.20.9/VERSION new/yast2-packager-2.20.10/VERSION --- old/yast2-packager-2.20.9/VERSION 2010-11-03 14:47:47.000000000 +0100 +++ new/yast2-packager-2.20.10/VERSION 2010-11-10 18:55:41.000000000 +0100 @@ -1 +1 @@ -2.20.9 +2.20.10 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-2.20.9/configure new/yast2-packager-2.20.10/configure --- old/yast2-packager-2.20.9/configure 2010-11-03 14:48:34.000000000 +0100 +++ new/yast2-packager-2.20.10/configure 2010-11-10 18:56:12.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.67 for yast2-packager 2.20.9. +# Generated by GNU Autoconf 2.67 for yast2-packager 2.20.10. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -551,8 +551,8 @@ # Identity of this package. PACKAGE_NAME='yast2-packager' PACKAGE_TARNAME='yast2-packager' -PACKAGE_VERSION='2.20.9' -PACKAGE_STRING='yast2-packager 2.20.9' +PACKAGE_VERSION='2.20.10' +PACKAGE_STRING='yast2-packager 2.20.10' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' PACKAGE_URL='' @@ -1221,7 +1221,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures yast2-packager 2.20.9 to adapt to many kinds of systems. +\`configure' configures yast2-packager 2.20.10 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1292,7 +1292,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-packager 2.20.9:";; + short | recursive ) echo "Configuration of yast2-packager 2.20.10:";; esac cat <<\_ACEOF @@ -1372,7 +1372,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-packager configure 2.20.9 +yast2-packager configure 2.20.10 generated by GNU Autoconf 2.67 Copyright (C) 2010 Free Software Foundation, Inc. @@ -1389,7 +1389,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by yast2-packager $as_me 2.20.9, which was +It was created by yast2-packager $as_me 2.20.10, which was generated by GNU Autoconf 2.67. Invocation command line was $ $0 $@ @@ -2319,7 +2319,7 @@ # Define the identity of the package. PACKAGE='yast2-packager' - VERSION='2.20.9' + VERSION='2.20.10' cat >>confdefs.h <<_ACEOF @@ -2441,7 +2441,7 @@ -VERSION="2.20.9" +VERSION="2.20.10" RPMNAME="yast2-packager" MAINTAINER="Ladislav Slezak <lslezak@suse.cz>" @@ -3359,7 +3359,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-packager $as_me 2.20.9, which was +This file was extended by yast2-packager $as_me 2.20.10, which was generated by GNU Autoconf 2.67. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3412,7 +3412,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -yast2-packager config.status 2.20.9 +yast2-packager config.status 2.20.10 configured by $0, generated by GNU Autoconf 2.67, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-2.20.9/configure.in new/yast2-packager-2.20.10/configure.in --- old/yast2-packager-2.20.9/configure.in 2010-11-03 14:48:30.000000000 +0100 +++ new/yast2-packager-2.20.10/configure.in 2010-11-10 18:56:08.000000000 +0100 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.18.11 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-packager, 2.20.9, http://bugs.opensuse.org/, yast2-packager) +AC_INIT(yast2-packager, 2.20.10, http://bugs.opensuse.org/, yast2-packager) 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.20.9" +VERSION="2.20.10" RPMNAME="yast2-packager" MAINTAINER="Ladislav Slezak <lslezak@suse.cz>" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-2.20.9/src/modules/PackageSlideShow.ycp new/yast2-packager-2.20.10/src/modules/PackageSlideShow.ycp --- old/yast2-packager-2.20.9/src/modules/PackageSlideShow.ycp 2010-11-02 15:28:39.000000000 +0100 +++ new/yast2-packager-2.20.10/src/modules/PackageSlideShow.ycp 2010-11-10 18:47:54.000000000 +0100 @@ -82,6 +82,10 @@ total_installed = 0; // avg_download_rate = 0; + installed_packages_list = []; + updated_packages_list = []; + removed_packages_list = []; + // temporary values current_provide_size = 0; current_install_size = 0; @@ -853,7 +857,7 @@ (TotalInstalledSize() * (100 - downloading_pct) / total_size_to_install); } - y2internal("Total package installation progress: %1%%", total_progress); + y2debug("Total package installation progress: %1%%", total_progress); SlideShow::StageProgress( total_progress, nil ); } @@ -1013,6 +1017,23 @@ SlideShow::SubProgress( pkg_percent, new_text ); } + global void DisplayGlobalProgress() + { + string rem_string = ""; + integer tot_rem_t = TotalRemainingTime(); + + rem_string = ( unit_is_seconds && bytes_per_second > 0 && tot_rem_t > 0) ? + sformat("%1 / %2", FormatRemainingSize(TotalRemainingSize()), FormatTimeShowOverflow(tot_rem_t)) + : FormatRemainingSize(TotalRemainingSize()); + + if (rem_string != "") + { + rem_string = rem_string + ", "; + } + + SlideShow::SetGlobalProgressLabel( SlideShow::CurrentStageDescription() + sformat(_(" (Remaining: %1%2 packages)"), rem_string, TotalRemainingPkgCount())); + } + global void DoneProvide( integer error, string reason, string name ) { if (error == 0) @@ -1090,6 +1111,9 @@ UpdateTotalProgress(false); + // Update global progress bar + DisplayGlobalProgress(); + if (updating) { updated_packages = updated_packages + 1; @@ -1191,13 +1215,7 @@ SlideShow::SubProgress( 0, msg ); // Update global progress bar - string rem_string = ""; - integer tot_rem_t = TotalRemainingTime(); - - rem_string = ( unit_is_seconds && bytes_per_second > 0 && tot_rem_t > 0) ? - sformat("%1 / %2", FormatRemainingSize(TotalRemainingSize()), FormatTimeShowOverflow(tot_rem_t)) - : FormatRemainingSize(TotalRemainingSize()); - SlideShow::SetGlobalProgressLabel( SlideShow::CurrentStageDescription() + sformat(_(" (Remaining: %1, %2 packages)"), rem_string, TotalRemainingPkgCount())); + DisplayGlobalProgress(); // // Update (user visible) installation log diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-2.20.9/src/modules/SlideShowCallbacks.ycp new/yast2-packager-2.20.10/src/modules/SlideShowCallbacks.ycp --- old/yast2-packager-2.20.9/src/modules/SlideShowCallbacks.ycp 2010-11-02 15:49:08.000000000 +0100 +++ new/yast2-packager-2.20.10/src/modules/SlideShowCallbacks.ycp 2010-11-10 18:55:56.000000000 +0100 @@ -6,7 +6,7 @@ * * Purpose: provides the Callbacks for SlideShow * - * $Id: SlideShowCallbacks.ycp 62717 2010-11-02 14:49:08Z lslezak $ + * $Id: SlideShowCallbacks.ycp 62811 2010-11-10 17:55:53Z lslezak $ * */ @@ -121,7 +121,7 @@ } if (SlideShow::GetUserAbort()) { - return "CANCEL"; + return "C"; } if (error != 0) { @@ -508,6 +508,9 @@ PackageSlideShow::SetCurrentCdNo( source, media ); PackageSlideShow::UpdateCurrentPackageProgress(0); PackageSlideShow::UpdateAllCdProgress(false); + + // display remaining packages + PackageSlideShow::DisplayGlobalProgress(); }; global string MediaChange (string error_code, string error, string url, string product, ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org