[yast-commit] r64908 - in /branches/SuSE-Code-11-SP1-Branch/packager: ./ agents/ package/ src/clients/ src/modules/

Author: lslezak Date: Wed Jul 20 10:59:57 2011 New Revision: 64908 URL: http://svn.opensuse.org/viewcvs/yast?rev=64908&view=rev Log: backport from SP2 branch: - correctly display download progress in DownloadInAdvance libzypp mode (bnc#616708) (backported commits 62714, partly 54940) - support for download in advance mode in yast2-wagon (fate#308951) - 2.17.79.1 Added: branches/SuSE-Code-11-SP1-Branch/packager/agents/etc_zypp_conf.scr - copied unchanged from r64331, branches/SuSE-Code-11-SP2-Branch/packager/agents/etc_zypp_conf.scr Modified: branches/SuSE-Code-11-SP1-Branch/packager/ (props changed) branches/SuSE-Code-11-SP1-Branch/packager/VERSION branches/SuSE-Code-11-SP1-Branch/packager/agents/Makefile.am branches/SuSE-Code-11-SP1-Branch/packager/package/yast2-packager.changes branches/SuSE-Code-11-SP1-Branch/packager/src/clients/inst_rpmcopy.ycp branches/SuSE-Code-11-SP1-Branch/packager/src/modules/PackageInstallation.ycp branches/SuSE-Code-11-SP1-Branch/packager/src/modules/PackageSlideShow.ycp branches/SuSE-Code-11-SP1-Branch/packager/src/modules/SlideShowCallbacks.ycp branches/SuSE-Code-11-SP1-Branch/packager/yast2-packager.spec.in Modified: branches/SuSE-Code-11-SP1-Branch/packager/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/packager/VERSION?rev=64908&r1=64907&r2=64908&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/packager/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/packager/VERSION Wed Jul 20 10:59:57 2011 @@ -1 +1 @@ -2.17.79 +2.17.79.1 Modified: branches/SuSE-Code-11-SP1-Branch/packager/agents/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/packager/agents/Makefile.am?rev=64908&r1=64907&r2=64908&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/packager/agents/Makefile.am (original) +++ branches/SuSE-Code-11-SP1-Branch/packager/agents/Makefile.am Wed Jul 20 10:59:57 2011 @@ -6,6 +6,7 @@ ag_zypp_repos scrconf_DATA = \ + etc_zypp_conf.scr \ zypp_repos.scr EXTRA_DIST = $(agent_SCRIPTS) $(scrconf_DATA) Modified: branches/SuSE-Code-11-SP1-Branch/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/packager/package/yast2-packager.changes?rev=64908&r1=64907&r2=64908&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/packager/package/yast2-packager.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/packager/package/yast2-packager.changes Wed Jul 20 10:59:57 2011 @@ -1,4 +1,13 @@ ------------------------------------------------------------------- +Wed Jul 20 08:58:01 UTC 2011 - lslezak@suse.cz + +- correctly display download progress in DownloadInAdvance + libzypp mode (bnc#616708) (backported commits 62714, + partly 54940) +- support for download in advance mode in yast2-wagon (fate#308951) +- 2.17.79.1 + +------------------------------------------------------------------- Wed Oct 27 10:14:52 CEST 2010 - mzugec@suse.cz - backported layout change for repository (bnc#510794) Modified: branches/SuSE-Code-11-SP1-Branch/packager/src/clients/inst_rpmcopy.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/packager/src/clients/inst_rpmcopy.ycp?rev=64908&r1=64907&r2=64908&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/packager/src/clients/inst_rpmcopy.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/packager/src/clients/inst_rpmcopy.ycp Wed Jul 20 10:59:57 2011 @@ -202,7 +202,15 @@ } // returns [ int successful, list failed, list remaining ] - list commit_result = PackageInstallation::CommitPackages( current_cd_no, 0 ); + map config = $[ "medium_nr" : current_cd_no ]; + if (PackageInstallation::DownloadInAdvance() == true) + { + config["download_mode"] = `download_in_advance; + } + + y2milestone("Commit config: %1", config); + + list commit_result = PackageInstallation::Commit(config); if (commit_result == nil || size (commit_result) == 0) { @@ -437,8 +445,13 @@ // sync package manager FIXME if (result != `abort && ! Stage::initial ()) { - y2milestone ("Calling PkgCommit (%1)", 9999); - Pkg::PkgCommit (9999); + map config = $[]; + if (PackageInstallation::DownloadInAdvance() == true) + { + config["download_mode"] = `download_in_advance; + } + y2milestone ("Calling Pkg::Commit(%1)", config); + Pkg::Commit(config); } // BNC #443755 Modified: branches/SuSE-Code-11-SP1-Branch/packager/src/modules/PackageInstallation.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/packager/src/modules/PackageInstallation.ycp?rev=64908&r1=64907&r2=64908&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/packager/src/modules/PackageInstallation.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/packager/src/modules/PackageInstallation.ycp Wed Jul 20 10:59:57 2011 @@ -21,6 +21,17 @@ import "Label"; + boolean download_in_advance = nil; + + global boolean DownloadInAdvance() + { + return download_in_advance; + } + + global void SetDownloadInAdvance(boolean enable) + { + download_in_advance = enable; + } global define any FakePackager( list<list> packages, string inst_source, boolean deleting ); @@ -81,10 +92,8 @@ * Return: [ int successful, list failed, list remaining, list srcremaining ] * **/ - global define list CommitPackages (integer media_number, - integer packages_installed) + global define list Commit(map config) { - y2milestone("CommitPackages called: media nr. %1, packages %2", media_number, packages_installed); if ( Mode::test () ) { @@ -95,8 +104,6 @@ } // install packages from this media - y2milestone ("CommitPackages (%1,%2): Pkg::TargetGetDU() %3", - media_number, packages_installed, Pkg::TargetGetDU()); list <integer> sources = Pkg::SourceGetCurrent (false); integer source_id = sources[0]:0; @@ -111,45 +118,28 @@ y2milestone("ID of the first repository: %1", first_source); - if (media_number == 0) + if (config["medium_nr"]:0 == 0) { PackageSlideShow::SetCurrentCdNo (first_source, 1); } else { - PackageSlideShow::SetCurrentCdNo (first_source, media_number); + PackageSlideShow::SetCurrentCdNo (first_source, config["medium_nr"]:0); } PackageSlideShow::UpdateAllCdProgress (false); SlideShow::StartTimer(); - boolean do_commit = true; - if (media_number != 0) - { - list > pkgs = Pkg::ResolvableProperties ("", `package, ""); - pkgs = filter (map p, pkgs, { - return p["status"]:nil == `selected; - }); - do_commit = size (pkgs) > 0; - } - list commit_result = []; - if (do_commit) - { - // returns [ int successful, list failed, list remaining, list srcremaining ] - y2milestone ("Calling PkgCommit (%1)", media_number); - commit_result = Pkg::PkgCommit (media_number); + // returns [ int successful, list failed, list remaining, list srcremaining ] + y2milestone ("Calling Pkg::Commit (%1)", config); + commit_result = Pkg::Commit(config); - SlideShow::StopTimer(); + SlideShow::StopTimer(); - if (commit_result == nil) - { - y2error ("Bad media number %1", media_number); - return []; - } - } - else + if (commit_result == nil) { - y2milestone ("No package from media %1 left for installation", media_number); + y2error ("Commit failed: %1", Pkg::LastError()); + return []; } // see if installation of some packages failed @@ -173,6 +163,19 @@ return commit_result; }; + /** + * commitPackages marked for deletion or installation + * Return: [ int successful, list failed, list remaining, list srcremaining ] + * + **/ + global define list CommitPackages (integer media_number, + integer packages_installed) + { + // this is a backward compatible wrapper for Commit() + y2milestone ("CommitPackages (%1,%2): Pkg::TargetGetDU() %3", media_number, packages_installed, Pkg::TargetGetDU()); + return Commit($["medium_nr" : media_number]); + } + // // Fake progress bars for Mode::test () Modified: branches/SuSE-Code-11-SP1-Branch/packager/src/modules/PackageSlideShow.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/packager/src/modules/PackageSlideShow.ycp?rev=64908&r1=64907&r2=64908&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/packager/src/modules/PackageSlideShow.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/packager/src/modules/PackageSlideShow.ycp Wed Jul 20 10:59:57 2011 @@ -15,6 +15,7 @@ import "Slides"; import "SlideShow"; import "String"; + import "URL"; global list total_sizes_per_cd_per_src = []; // total sizes per inst-src: [ [42, 43, 44], [12, 13, 14] ] global list remaining_sizes_per_cd_per_src = []; // remaining sizes @@ -27,6 +28,9 @@ global string media_type = _("Medium"); global integer total_size_installed = 0; global integer total_size_to_install = 0; + global integer total_count_to_download = 0; + global integer total_count_downloaded = 0; + global integer downloading_pct = 0; global integer min_time_per_cd = 10; // const - minimum time displayed per CD if there is something to install global integer max_time_per_cd = 7200; // const - seconds to cut off predicted time (it's bogus anyway) global integer size_column = 1; // const - column number for remaining size per CD @@ -46,7 +50,6 @@ string provide_name = ""; // currently downlaoded package name string provide_size = ""; // currently downlaoded package size - /*****************************************************************************/ /*************** Formatting functions and helpers ***************************/ /*****************************************************************************/ @@ -325,8 +328,8 @@ { if ( ! silent ) { - y2error( "SlideShow::SanityCheck(): Slide show not correctly initialized: " + - "SlideShow::InitPkgData() never called!" ); + y2error( "PackageSlideShow::SanityCheck(): Slide show not correctly initialized: " + + "PackageSlideShow::InitPkgData() never called!" ); } return false; } @@ -340,7 +343,7 @@ } else if (!silent) { - y2error(-1, "SlideShow::SanityCheck(): Illegal values for current_src (%1) or current_cd (%2)", + y2error(-1, "PackageSlideShow::SanityCheck(): Illegal values for current_src_no (%1) or current_cd_no (%2)", current_src_no, current_cd_no ); y2milestone( "total sizes: %1", total_sizes_per_cd_per_src ); } @@ -385,6 +388,50 @@ y2milestone( "SubtractPackageSize( %1 ) -> %2", pkg_size, remaining_sizes_per_cd_per_src); } + integer packages_to_download(listsrc_mapping) + { + y2milestone("Packages to download input: %1", src_mapping); + + integer ret = 0; + + integer i = 0; + foreach(list<integer> media_mapping, src_mapping, + { + if (size(media_mapping) > 0) + { + // check if the repository is remote + string repo_url = Pkg::SourceGeneralData(i)["url"]:""; + string repo_schema = tolower(URL::Parse(repo_url)["scheme"]:""); + + if (contains(["http", "https", "ftp", "sftp"], repo_schema)) + { + integer total = 0; + foreach(integer count, media_mapping, + { + total = total + count; + } + ); + + y2milestone("Downloading %1 packages from remote repository %2", total, i); + ret = ret + total; + } + } + + i = i + 1; + } + ); + + y2milestone("Total number of packages to download: %1", ret); + + return ret; + } + + integer packages_to_install(listsrc_mapping) + { + integer ret = ListSum(flatten(src_mapping)); + y2milestone("Total number of packages to install: %1", ret); + return ret; + } /** * Initialize internal pacakge data, such as remaining package sizes and @@ -433,10 +480,17 @@ remaining_sizes_per_cd_per_src = (list) eval (total_sizes_per_cd_per_src); remaining_pkg_count_per_cd_per_src = (list) eval (total_pkg_count_per_cd_per_src); total_cd_count = size( flatten( total_sizes_per_cd_per_src ) ); + total_count_to_download = packages_to_download(total_pkg_count_per_cd_per_src); + total_count_downloaded = 0; + integer total_count_to_install = packages_to_install(total_pkg_count_per_cd_per_src); + downloading_pct = 100 * total_count_to_download / (total_count_to_install + total_count_to_download); init_pkg_data_complete = true; - - y2milestone( "SlideShow::InitPkgData() done; total_sizes_per_cd_per_src: %1", total_sizes_per_cd_per_src ); - y2milestone( "SlideShow::InitPkgData(): pkg: %1", total_pkg_count_per_cd_per_src ); + + // reset the history log + SlideShow::inst_log = ""; + + y2milestone( "PackageSlideShow::InitPkgData() done; total_sizes_per_cd_per_src: %1", total_sizes_per_cd_per_src ); + y2milestone( "PackageSlideShow::InitPkgData(): pkg: %1", total_pkg_count_per_cd_per_src ); // RebuildDialog(true); } @@ -759,6 +813,27 @@ } } + // update the overall progress value (download + installation) + void UpdateTotalProgressValue() + { + integer total_progress = 0; + + if (total_count_to_download == 0) + { + // no package to download, just use the install size + total_progress = (TotalInstalledSize() * 100 / total_size_to_install); + } + else + { + // compute the total progress (use both download and installation size) + total_progress = (total_count_downloaded * downloading_pct / total_count_to_download) + + (TotalInstalledSize() * (100 - downloading_pct) / total_size_to_install); + } + + y2internal("Total package installation progress: %1%%", total_progress); + SlideShow::StageProgress( total_progress, nil ); + } + /** * Update progress widgets **/ @@ -772,7 +847,8 @@ total_size_to_install_kB = 1; } - SlideShow::StageProgress( ( TotalInstalledSize() >> 10 ) * 100 / total_size_to_install_kB, nil /*, SlideShow::GetProgressLabel()*/ ); + // update the overall progress value (download + installation) + UpdateTotalProgressValue(); UpdateCurrentCdProgress(silent_check); @@ -912,6 +988,26 @@ SlideShow::SubProgress( pkg_percent, new_text ); } + global void DoneProvide( integer error, string reason, string name ) + { + if (error == 0) + { + total_count_downloaded = total_count_downloaded + 1; + y2milestone("Downloaded %1/%2 packages (%3%%)", total_count_downloaded, total_count_to_download, total_count_downloaded * 100 / total_count_to_download); + + // move the progress also for downloaded files + UpdateTotalProgressValue(); + + if (Pkg::CommitPolicy()["download_mode"]:`default == `download_in_advance) + { + // display download progress in DownloadInAdvance mode + // translations: progress message (part1) + SlideShow::SetGlobalProgressLabel( _("Downloading Packages...") + + // progress message (part2) + sformat(_(" (Downloaded %1 of %2 packages)"), total_count_downloaded, total_count_to_download)); + } + } + } /** * Update progress widgets for all CDs. @@ -1110,10 +1206,13 @@ */ global void SlideProvideStart (string pkg_name, integer sz, boolean remote) { - // message in the installatino log, %1 is package name, - // %2 is package size - SlideGenericProvideStart (pkg_name, sz, _("Downloading %1 (download size %2)"), - remote); + if (remote) + { + // message in the installatino log, %1 is package name, + // %2 is package size + SlideGenericProvideStart (pkg_name, sz, _("Downloading %1 (download size %2)"), + remote); + } } Modified: branches/SuSE-Code-11-SP1-Branch/packager/src/modules/SlideShowCallbacks.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/packager/src/modules/SlideShowCallbacks.ycp?rev=64908&r1=64907&r2=64908&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/packager/src/modules/SlideShowCallbacks.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/packager/src/modules/SlideShowCallbacks.ycp Wed Jul 20 10:59:57 2011 @@ -80,12 +80,9 @@ global void StartProvide( string name, integer archivesize, boolean remote ) { pkg_inprogress = name; + _remote_provide = remote; - if ( remote ) - { - PackageSlideShow::SlideProvideStart (name , archivesize, remote); - _remote_provide = true; - } + PackageSlideShow::SlideProvideStart (name , archivesize, remote); } @@ -119,6 +116,7 @@ if ( _remote_provide ) { PackageSlideShow::UpdateCurrentPackageProgress( 100 ); + PackageSlideShow::DoneProvide( error, reason, name ); _remote_provide = false; } if (SlideShow::GetUserAbort()) @@ -544,8 +542,7 @@ } /** - * Install callbacks for slideshow. Should be in SlideShowCallbacks but - * that doesn't work at the moment. + * Install callbacks for slideshow. */ global void InstallSlideShowCallbacks() { Modified: branches/SuSE-Code-11-SP1-Branch/packager/yast2-packager.spec.in URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/packager/yast2-packager.spec.in?rev=64908&r1=64907&r2=64908&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/packager/yast2-packager.spec.in (original) +++ branches/SuSE-Code-11-SP1-Branch/packager/yast2-packager.spec.in Wed Jul 20 10:59:57 2011 @@ -10,14 +10,14 @@ # URLRecode.pm BuildRequires: yast2 >= 2.17.79 -# "keeppackages" repo property -BuildRequires: yast2-pkg-bindings >= 2.17.27 +# Pkg::Commit() +BuildRequires: yast2-pkg-bindings >= 2.17.45.1 # Newly added RPM Requires: yast2-country-data >= 2.16.3 -# "keeppackages" repo property -Requires: yast2-pkg-bindings >= 2.17.27 +# Pkg::Commit() +Requires: yast2-pkg-bindings >= 2.17.45.1 # URLRecode.pm Requires: yast2 >= 2.17.79 -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org