Author: lslezak Date: Tue Nov 2 15:49:08 2010 New Revision: 62717 URL: http://svn.opensuse.org/viewcvs/yast?rev=62717&view=rev Log: - correctly collect package installation log in DownloadInAdvance libzypp mode - 2.20.8 Modified: trunk/packager/VERSION trunk/packager/package/yast2-packager.changes trunk/packager/src/modules/PackageSlideShow.ycp trunk/packager/src/modules/SlideShowCallbacks.ycp trunk/packager/yast2-packager.spec.in Modified: trunk/packager/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/VERSION?rev=62717&r1=62716&r2=62717&view=diff ============================================================================== --- trunk/packager/VERSION (original) +++ trunk/packager/VERSION Tue Nov 2 15:49:08 2010 @@ -1 +1 @@ -2.20.7 +2.20.8 Modified: trunk/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/package/yast2-packager.changes?rev=62717&r1=62716&r2=62717&view=diff ============================================================================== --- trunk/packager/package/yast2-packager.changes (original) +++ trunk/packager/package/yast2-packager.changes Tue Nov 2 15:49:08 2010 @@ -3,6 +3,7 @@ - correctly display download progress in DownloadInAdvance libzypp mode (bnc#616708) +- 2.20.8 ------------------------------------------------------------------- Mon Nov 1 16:30:27 UTC 2010 - lslezak@suse.cz Modified: trunk/packager/src/modules/PackageSlideShow.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/modules/PackageSlideShow.ycp?rev=62717&r1=62716&r2=62717&view=diff ============================================================================== --- trunk/packager/src/modules/PackageSlideShow.ycp (original) +++ trunk/packager/src/modules/PackageSlideShow.ycp Tue Nov 2 15:49:08 2010 @@ -71,7 +71,6 @@ integer current_provide_size = 0; integer current_install_size = 0; - string current_pkg_name = ""; boolean updating = false; void ResetPackageSummary() @@ -86,7 +85,6 @@ // temporary values current_provide_size = 0; current_install_size = 0; - current_pkg_name = ""; updating = false; } @@ -1098,7 +1096,7 @@ if (Mode::normal()) { - updated_packages_list = add(updated_packages_list, current_pkg_name); + updated_packages_list = add(updated_packages_list, pkg_name); } } else @@ -1107,7 +1105,7 @@ if (Mode::normal()) { - installed_packages_list = add(installed_packages_list, current_pkg_name); + installed_packages_list = add(installed_packages_list, pkg_name); } } @@ -1120,7 +1118,7 @@ if (Mode::normal()) { - removed_packages_list = add(removed_packages_list, current_pkg_name); + removed_packages_list = add(removed_packages_list, pkg_name); } } } @@ -1136,6 +1134,7 @@ * @param deleting Flag: deleting (true) or installing (false) package? **/ global void SlideDisplayStart( string pkg_name, + string pkg_location, string pkg_summary, integer pkg_size, boolean deleting ) @@ -1143,10 +1142,8 @@ if ( ! SanityCheck( false ) ) return; // remove path - pkg_name = StripPath(pkg_name); - - // remove release and .rpm suffix - // pkg_name = StripReleaseNo( pkg_name ); // bug #154872 + string pkg_filename = StripPath(pkg_location); + y2internal("pkg_name: %1", pkg_name); if ( deleting ) { @@ -1175,15 +1172,14 @@ // Heading for the progress bar for the current package // while it is deleted. "%1" is the package name. msg = sformat( _("Deleting %1"), pkg_name ); - current_pkg_name = pkg_name; } else { - updating = Pkg::PkgInstalled(current_pkg_name); + updating = Pkg::PkgInstalled(pkg_name); // package installation - summary text // %1 is RPM name, %2 is installed (unpacked) size (e.g. 6.20MB) - msg = sformat( _("Installing %1 (installed size %2)"), pkg_name, String::FormatSize( pkg_size ) ); + msg = sformat( _("Installing %1 (installed size %2)"), pkg_filename, String::FormatSize( pkg_size ) ); current_install_size = pkg_size; } @@ -1270,7 +1266,6 @@ global void SlideProvideStart (string pkg_name, integer sz, boolean remote) { current_provide_size = remote ? sz : 0; - current_pkg_name = pkg_name; if (remote) { Modified: trunk/packager/src/modules/SlideShowCallbacks.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/modules/SlideShowCallbacks.ycp?rev=62717&r1=62716&r2=62717&view=diff ============================================================================== --- trunk/packager/src/modules/SlideShowCallbacks.ycp (original) +++ trunk/packager/src/modules/SlideShowCallbacks.ycp Tue Nov 2 15:49:08 2010 @@ -284,9 +284,9 @@ * Note: The packager doesn't call this directly - the corresponding wrapper callbacks do * and pass the "deleting" flag as appropriate. **/ - global void DisplayStartInstall(string pkg_name, string pkg_description, integer pkg_size, boolean deleting ) + global void DisplayStartInstall(string pkg_name, string pkg_location, string pkg_description, integer pkg_size, boolean deleting ) { - PackageSlideShow::SlideDisplayStart( pkg_name, pkg_description, pkg_size, deleting ); + PackageSlideShow::SlideDisplayStart( pkg_name, pkg_location, pkg_description, pkg_size, deleting ); HandleInput(); // warn user about exhausted diskspace during installation (not if deleting packages) @@ -368,13 +368,13 @@ /** * at start of package install */ - global void StartPackage( string name, string summary, integer install_size, boolean is_delete ) + global void StartPackage( string name, string location, string summary, integer install_size, boolean is_delete ) { PackageCallbacks::_package_name = name; PackageCallbacks::_package_size = install_size; PackageCallbacks::_deleting_package = is_delete; - DisplayStartInstall( name, + DisplayStartInstall( name, location, summary, install_size, is_delete); Modified: trunk/packager/yast2-packager.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/yast2-packager.spec.in?rev=62717&r1=62716&r2=62717&view=diff ============================================================================== --- trunk/packager/yast2-packager.spec.in (original) +++ trunk/packager/yast2-packager.spec.in Tue Nov 2 15:49:08 2010 @@ -12,14 +12,14 @@ # Installation summary in PackagesUI:: BuildRequires: yast2 >= 2.18.1 -# "keeppackages" repo property -BuildRequires: yast2-pkg-bindings >= 2.17.27 +# changed StartPackage callback signature +BuildRequires: yast2-pkg-bindings >= 2.20.3 # Newly added RPM Requires: yast2-country-data >= 2.16.3 -# "keeppackages" repo property -Requires: yast2-pkg-bindings >= 2.17.27 +# changed StartPackage callback signature +Requires: yast2-pkg-bindings >= 2.20.3 # Installation summary in PackagesUI:: Requires: yast2 >= 2.18.1 -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org