Author: lslezak Date: Tue Jun 14 10:50:33 2011 New Revision: 64331 URL: http://svn.opensuse.org/viewcvs/yast?rev=64331&view=rev Log: implemented download in advance mode support in yast2-wagon (fate#308951) merged from tmp/lslezak/SP2 branch Added: branches/SuSE-Code-11-SP2-Branch/packager/agents/etc_zypp_conf.scr - copied unchanged from r64299, branches/tmp/lslezak/SP2/packager/agents/etc_zypp_conf.scr Modified: branches/SuSE-Code-11-SP2-Branch/packager/ (props changed) branches/SuSE-Code-11-SP2-Branch/packager/VERSION branches/SuSE-Code-11-SP2-Branch/packager/agents/Makefile.am branches/SuSE-Code-11-SP2-Branch/packager/package/yast2-packager.changes branches/SuSE-Code-11-SP2-Branch/packager/src/clients/inst_rpmcopy.ycp branches/SuSE-Code-11-SP2-Branch/packager/src/modules/PackageInstallation.ycp branches/SuSE-Code-11-SP2-Branch/packager/src/modules/PackageSlideShow.ycp branches/SuSE-Code-11-SP2-Branch/packager/src/modules/SlideShowCallbacks.ycp branches/SuSE-Code-11-SP2-Branch/packager/yast2-packager.spec.in branches/SuSE-Code-11-SP2-Branch/pkg-bindings/ (props changed) branches/SuSE-Code-11-SP2-Branch/pkg-bindings/VERSION branches/SuSE-Code-11-SP2-Branch/pkg-bindings/package/yast2-pkg-bindings.changes branches/SuSE-Code-11-SP2-Branch/pkg-bindings/src/Package.cc branches/SuSE-Code-11-SP2-Branch/pkg-bindings/src/PkgFunctions.cc branches/SuSE-Code-11-SP2-Branch/pkg-bindings/src/PkgFunctions.h branches/SuSE-Code-11-SP2-Branch/wagon/ (props changed) branches/SuSE-Code-11-SP2-Branch/wagon/VERSION branches/SuSE-Code-11-SP2-Branch/wagon/package/yast2-wagon.changes branches/SuSE-Code-11-SP2-Branch/wagon/src/clients/wagon_update_proposal.ycp branches/SuSE-Code-11-SP2-Branch/wagon/src/modules/Wagon.ycp branches/SuSE-Code-11-SP2-Branch/wagon/yast2-wagon.spec.in Modified: branches/SuSE-Code-11-SP2-Branch/packager/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/packager/VERSION?rev=64331&r1=64330&r2=64331&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/packager/VERSION (original) +++ branches/SuSE-Code-11-SP2-Branch/packager/VERSION Tue Jun 14 10:50:33 2011 @@ -1 +1 @@ -2.17.81 +2.17.82 Modified: branches/SuSE-Code-11-SP2-Branch/packager/agents/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/packager/agents/Makefile.am?rev=64331&r1=64330&r2=64331&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/packager/agents/Makefile.am (original) +++ branches/SuSE-Code-11-SP2-Branch/packager/agents/Makefile.am Tue Jun 14 10:50:33 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-SP2-Branch/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/packager/package/yast2-packager.changes?rev=64331&r1=64330&r2=64331&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/packager/package/yast2-packager.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/packager/package/yast2-packager.changes Tue Jun 14 10:50:33 2011 @@ -1,4 +1,13 @@ ------------------------------------------------------------------- +Tue Jun 14 08:37:57 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.82 + +------------------------------------------------------------------- Fri Jun 10 09:34:21 CEST 2011 - locilka@suse.cz - Added support for add_on_products[.xml] also in inst-sys Modified: branches/SuSE-Code-11-SP2-Branch/packager/src/clients/inst_rpmcopy.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/packager/src/clients/inst_rpmcopy.ycp?rev=64331&r1=64330&r2=64331&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/packager/src/clients/inst_rpmcopy.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/packager/src/clients/inst_rpmcopy.ycp Tue Jun 14 10:50:33 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-SP2-Branch/packager/src/modules/PackageInstallation.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/packager/src/modules/PackageInstallation.ycp?rev=64331&r1=64330&r2=64331&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/packager/src/modules/PackageInstallation.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/packager/src/modules/PackageInstallation.ycp Tue Jun 14 10:50:33 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-SP2-Branch/packager/src/modules/PackageSlideShow.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/packager/src/modules/PackageSlideShow.ycp?rev=64331&r1=64330&r2=64331&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/packager/src/modules/PackageSlideShow.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/packager/src/modules/PackageSlideShow.ycp Tue Jun 14 10:50:33 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-SP2-Branch/packager/src/modules/SlideShowCallbacks.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/packager/src/modules/SlideShowCallbacks.ycp?rev=64331&r1=64330&r2=64331&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/packager/src/modules/SlideShowCallbacks.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/packager/src/modules/SlideShowCallbacks.ycp Tue Jun 14 10:50:33 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-SP2-Branch/packager/yast2-packager.spec.in URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/packager/yast2-packager.spec.in?rev=64331&r1=64330&r2=64331&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/packager/yast2-packager.spec.in (original) +++ branches/SuSE-Code-11-SP2-Branch/packager/yast2-packager.spec.in Tue Jun 14 10:50:33 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.46 # 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.46 # URLRecode.pm Requires: yast2 >= 2.17.79 Modified: branches/SuSE-Code-11-SP2-Branch/pkg-bindings/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/pkg-bindings/VERSION?rev=64331&r1=64330&r2=64331&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/pkg-bindings/VERSION (original) +++ branches/SuSE-Code-11-SP2-Branch/pkg-bindings/VERSION Tue Jun 14 10:50:33 2011 @@ -1 +1 @@ -2.17.46 +2.17.47 Modified: branches/SuSE-Code-11-SP2-Branch/pkg-bindings/package/yast2-pkg-bindings.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/pkg-bindings/package/yast2-pkg-bindings.changes?rev=64331&r1=64330&r2=64331&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/pkg-bindings/package/yast2-pkg-bindings.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/pkg-bindings/package/yast2-pkg-bindings.changes Tue Jun 14 10:50:33 2011 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Jun 14 08:40:30 UTC 2011 - lslezak@suse.cz + +- added Pkg::CommitPolicy() +- support for download in advance mode in yast2-wagon (fate#308951) +- 2.17.47 + +------------------------------------------------------------------- Fri Apr 15 15:57:13 UTC 2011 - lslezak@localhost - 2.17.46 Modified: branches/SuSE-Code-11-SP2-Branch/pkg-bindings/src/Package.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/pkg-bindings/src/Package.cc?rev=64331&r1=64330&r2=64331&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/pkg-bindings/src/Package.cc (original) +++ branches/SuSE-Code-11-SP2-Branch/pkg-bindings/src/Package.cc Tue Jun 14 10:50:33 2011 @@ -2015,7 +2015,7 @@ return YCPVoid(); } -YCPValue PkgFunctions::CommitHelper(const zypp::ZYppCommitPolicy &policy) +YCPValue PkgFunctions::CommitHelper(const zypp::ZYppCommitPolicy *policy) { zypp::ZYpp::CommitResult result; @@ -2029,7 +2029,7 @@ last_reported_repo = -1; last_reported_mediumnr = 1; - result = zypp_ptr()->commit(policy); + result = zypp_ptr()->commit(*policy); } catch (const zypp::target::TargetAbortedException & excpt) { @@ -2093,6 +2093,48 @@ return ret; } +YCPValue PkgFunctions::CommitPolicy() +{ + YCPMap ret; + + if (commit_policy == NULL) + { + return ret; + } + + zypp::DownloadMode d_mode = commit_policy->downloadMode(); + std::string mode; + + switch (d_mode) + { + case zypp::DownloadDefault: + mode = "default"; + break; + case zypp::DownloadOnly: + mode = "download_only"; + break; + case zypp::DownloadInAdvance: + mode = "download_in_advance"; + break; + case zypp::DownloadInHeaps: + mode = "download_in_heaps"; + break; + case zypp::DownloadAsNeeded: + mode = "download_as_needed"; + break; + default : + y2error("Unknown download mode"); + } + + if (!mode.empty()) + { + ret->add(YCPString("download_mode"), YCPSymbol(mode)); + } + + + return ret; +} + /** @builtin PkgCommit @@ -2118,10 +2160,15 @@ return YCPError ("Bad args to Pkg::PkgCommit"); } - zypp::ZYppCommitPolicy policy; - policy.restrictToMedia( medianr ); + commit_policy = new zypp::ZYppCommitPolicy; + commit_policy->restrictToMedia(medianr); + + YCPValue ret = CommitHelper(commit_policy); - return CommitHelper(policy); + delete commit_policy; + commit_policy = NULL; + + return ret; } /** @@ -2143,7 +2190,7 @@ /* TYPEINFO: list<any>(integer)*/ YCPValue PkgFunctions::Commit (const YCPMap& config) { - zypp::ZYppCommitPolicy policy; + commit_policy = new zypp::ZYppCommitPolicy; if (!config.isNull()) { @@ -2158,28 +2205,32 @@ if (mode == "default") { - policy.downloadMode(zypp::DownloadDefault); + commit_policy->downloadMode(zypp::DownloadDefault); } else if (mode == "download_only") { - policy.downloadMode(zypp::DownloadOnly); + commit_policy->downloadMode(zypp::DownloadOnly); } else if (mode == "download_in_advance") { - policy.downloadMode(zypp::DownloadInAdvance); + commit_policy->downloadMode(zypp::DownloadInAdvance); } else if (mode == "download_in_heaps") { - policy.downloadMode(zypp::DownloadInHeaps); + commit_policy->downloadMode(zypp::DownloadInHeaps); } else if (mode == "download_as_needed") { - policy.downloadMode(zypp::DownloadAsNeeded); + commit_policy->downloadMode(zypp::DownloadAsNeeded); } else { y2error("Invalid download mode: %s", mode.c_str()); _last_error.setLastError(std::string("Invalid download mode: ") + mode); + + delete commit_policy; + commit_policy = NULL; + return YCPVoid(); } @@ -2189,6 +2240,10 @@ { y2error("Invalid download mode: symbol is required, got: %s", config->value(key)->asString()->value().c_str()); _last_error.setLastError(std::string("Invalid download mode: ") + config->value(key)->asString()->value()); + + delete commit_policy; + commit_policy = NULL; + return YCPVoid(); } } @@ -2200,7 +2255,7 @@ if (config->value(key)->isInteger()) { unsigned medium_nr = config->value(key)->asInteger()->value(); - policy.restrictToMedia(medium_nr); + commit_policy->restrictToMedia(medium_nr); y2milestone("Restricting commit only to medium number: %u", medium_nr); } @@ -2208,6 +2263,10 @@ { y2error("Invalid medium number: integer is required, got: %s", config->value(key)->asString()->value().c_str()); _last_error.setLastError(std::string("Invalid medium number: ") + config->value(key)->asString()->value()); + + delete commit_policy; + commit_policy = NULL; + return YCPVoid(); } } @@ -2219,7 +2278,7 @@ if (config->value(key)->isBoolean()) { bool dry_run = config->value(key)->asBoolean()->value(); - policy.dryRun(dry_run); + commit_policy->dryRun(dry_run); y2milestone("Dry run commit: %s", config->value(key)->asString()->value().c_str()); } @@ -2227,6 +2286,10 @@ { y2error("Dry run option: boolean is required, got: %s", config->value(key)->asString()->value().c_str()); _last_error.setLastError(std::string("Invalid dry run option: ") + config->value(key)->asString()->value()); + + delete commit_policy; + commit_policy = NULL; + return YCPVoid(); } } @@ -2238,7 +2301,7 @@ if (config->value(key)->isBoolean()) { bool exclude_docs = config->value(key)->asBoolean()->value(); - policy.rpmExcludeDocs(exclude_docs); + commit_policy->rpmExcludeDocs(exclude_docs); y2milestone("Excluding documentation: %s", config->value(key)->asString()->value().c_str()); } @@ -2246,6 +2309,10 @@ { y2error("Exclude documentation option: boolean is required, got: %s", config->value(key)->asString()->value().c_str()); _last_error.setLastError(std::string("Invalid exclude documentation option: ") + config->value(key)->asString()->value()); + + delete commit_policy; + commit_policy = NULL; + return YCPVoid(); } } @@ -2257,7 +2324,7 @@ if (config->value(key)->isBoolean()) { bool no_signature = config->value(key)->asBoolean()->value(); - policy.rpmNoSignature(no_signature); + commit_policy->rpmNoSignature(no_signature); y2milestone("Don't check RPM signature: %s", config->value(key)->asString()->value().c_str()); } @@ -2265,12 +2332,21 @@ { y2error("No signature option: boolean is required, got: %s", config->value(key)->asString()->value().c_str()); _last_error.setLastError(std::string("Invalid no signature option: ") + config->value(key)->asString()->value()); + + delete commit_policy; + commit_policy = NULL; + return YCPVoid(); } } } - return CommitHelper(policy); + YCPValue ret = CommitHelper(commit_policy); + + delete commit_policy; + commit_policy = NULL; + + return ret; } /** Modified: branches/SuSE-Code-11-SP2-Branch/pkg-bindings/src/PkgFunctions.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/pkg-bindings/src/PkgFunctions.cc?rev=64331&r1=64330&r2=64331&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/pkg-bindings/src/PkgFunctions.cc (original) +++ branches/SuSE-Code-11-SP2-Branch/pkg-bindings/src/PkgFunctions.cc Tue Jun 14 10:50:33 2011 @@ -61,6 +61,7 @@ _target_root( "/" ) , _target_loaded(false) , zypp_pointer(NULL) + , commit_policy(NULL) ,_callbackHandler( *new CallbackHandler(*this) ) , base_product(NULL) { Modified: branches/SuSE-Code-11-SP2-Branch/pkg-bindings/src/PkgFunctions.h URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/pkg-bindings/src/PkgFunctions.h?rev=64331&r1=64330&r2=64331&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/pkg-bindings/src/PkgFunctions.h (original) +++ branches/SuSE-Code-11-SP2-Branch/pkg-bindings/src/PkgFunctions.h Tue Jun 14 10:50:33 2011 @@ -49,6 +49,7 @@ #include #include #include +#include #include #include @@ -194,6 +195,9 @@ YCPMap Resolvable2YCPMap(const zypp::PoolItem &item, const std::string &req_kind, bool dependencies); + // CommitPolicy used for commit + zypp::ZYppCommitPolicy *commit_policy; + private: /** @@ -704,11 +708,13 @@ YCPBoolean PkgSolveCheckTargetOnly (); /* TYPEINFO: integer()*/ YCPValue PkgSolveErrors (); - YCPValue CommitHelper(const zypp::ZYppCommitPolicy &policy); + YCPValue CommitHelper(const zypp::ZYppCommitPolicy *policy); /* TYPEINFO: list<any>(integer)*/ YCPValue PkgCommit (const YCPInteger& medianr); /* TYPEINFO: list<any>(map)*/ YCPValue Commit (const YCPMap& config); + /* TYPEINFO: map*/ + YCPValue CommitPolicy(); /* TYPEINFO: boolean(map)*/ YCPValue AddLock(const YCPMap &lock); Modified: branches/SuSE-Code-11-SP2-Branch/wagon/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/wagon/VERSION?rev=64331&r1=64330&r2=64331&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/wagon/VERSION (original) +++ branches/SuSE-Code-11-SP2-Branch/wagon/VERSION Tue Jun 14 10:50:33 2011 @@ -1 +1 @@ -2.17.18 +2.17.19 Modified: branches/SuSE-Code-11-SP2-Branch/wagon/package/yast2-wagon.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/wagon/package/yast2-wagon.changes?rev=64331&r1=64330&r2=64331&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/wagon/package/yast2-wagon.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/wagon/package/yast2-wagon.changes Tue Jun 14 10:50:33 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Jun 14 08:42:02 UTC 2011 - lslezak@suse.cz + +- implemented download in advance mode support (fate#308951) +- 2.17.19 + +------------------------------------------------------------------- Mon Jan 3 15:32:13 CET 2011 - locilka@suse.cz - Do not allow to continue without package lock (BNC #616982) Modified: branches/SuSE-Code-11-SP2-Branch/wagon/src/clients/wagon_update_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/wagon/src/clients/wagon_update_proposal.ycp?rev=64331&r1=64330&r2=64331&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/wagon/src/clients/wagon_update_proposal.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/wagon/src/clients/wagon_update_proposal.ycp Tue Jun 14 10:50:33 2011 @@ -40,11 +40,23 @@ } Wagon::ProposeDUP(); + Wagon::ProposeDownloadMode(); ret = Wagon::ProposalSummary(); } else if (func == "AskUser") { - Report::Message (_("There is nothing to set.")); + string chosen_id = param["chosen_id"]:""; + + // toggle the download mode status + if (chosen_id == Wagon::GetDownloadModeLink()) + { + Wagon::download_in_advance = !Wagon::download_in_advance; + } + else + { + Report::Message (_("There is nothing to set.")); + } + ret = $[ "workflow_sequence" : `next ]; } else if (func == "Description") { Modified: branches/SuSE-Code-11-SP2-Branch/wagon/src/modules/Wagon.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/wagon/src/modules/Wagon.ycp?rev=64331&r1=64330&r2=64331&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/wagon/src/modules/Wagon.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/wagon/src/modules/Wagon.ycp Tue Jun 14 10:50:33 2011 @@ -31,6 +31,8 @@ import "Update"; import "FileUtils"; import "String"; + import "Packages"; + import "PackageInstallation"; boolean running_by_applet = false; @@ -75,6 +77,13 @@ return update_workflow_type; } + const string download_mode_link = "wagon-download_in_advance"; + + global define string GetDownloadModeLink() + { + return download_mode_link; + } + string migration_method = nil; global string migration_method_file = sformat ("%1/wagon_migration_method", Directory::vardir); @@ -379,6 +388,68 @@ return true; } + string FindMountPoint(string dir, list<string> dirs) + { + while (dir != nil && dir != "" && !contains(dirs, dir)) + { + // strip the last path component and try it again + list<string> comps = splitstring(dir, "/"); + comps = remove(comps, size(comps) - 1); + dir = mergestring(comps, "/"); + } + + return dir; + } + + map CheckDownloadSpace() + { + map du = Pkg::TargetGetDU(); + list<string> mounts = maplist(string dir, list info, du, {return dir;}); + + map zconfig = Pkg::ZConfig(); + string pkg_path = zconfig["repo_packages_path"]:""; + + string packages_mount = FindMountPoint(pkg_path, mounts); + y2milestone("Packages will we downloaded to mountpoint %1", packages_mount); + + // download size in bytes + integer download_size = Packages::CountSizeToBeDownloaded(); + y2milestone("Size of packages to download: %1MB", download_size >> 20); + + // du contains maps: $[ "dir" : [ total, used, pkgusage, readonly ], .... ] + integer after_install = du[packages_mount, 2]:0; + integer total = du[packages_mount, 0]:0; + + symbol result = `ok; + string message = ""; + + if (after_install + download_size < total) + { + result = `error; + message = "Not enough free space"; + y2error("Not enough free space for download in advance upgrade"); + } + else if (after_install + download_size < total - 100<<20) + { + result = `warning; + message = "Not enough free space"; + y2error("Not enough free space for download in advance upgrade"); + } + + return $[ "result" : result, "message" : message ]; + } + + global void ProposeDownloadMode() + { + if (PackageInstallation::DownloadInAdvance() == nil) + { + map dwspace = CheckDownloadSpace(); + + PackageInstallation::SetDownloadInAdvance(dwspace["result"]:nil == `ok); + y2milestone("Proposed download in advance mode: %1", PackageInstallation::DownloadInAdvance()); + } + } + global map MinimizeProductMap (map product) { if (haskey (product, "license")) product["license"] = "..."; if (haskey (product, "description")) product["description"] = "..."; @@ -510,9 +581,14 @@ ret = "<ul>\n" + ret + "</ul>\n"; + ret = ret + "<ul><li>\n" + _("Download all packages before upgrade: ") + + sformat("%2</a>", download_mode_link, (PackageInstallation::DownloadInAdvance() ? _("Enabled") : _("Disabled"))) + + "</li></ul>\n"; + map summary = $[ "preformatted_proposal" : ret, - // help text + "links" : [ download_mode_link ], + // help text, TODO FIXME: replace the inner <p> by <b> "help" : _("<p>To change the update settings, go to <p>Packages Proposal</p> section.</p>"), ]; Modified: branches/SuSE-Code-11-SP2-Branch/wagon/yast2-wagon.spec.in URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/wagon/yast2-wagon.spec.in?rev=64331&r1=64330&r2=64331&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/wagon/yast2-wagon.spec.in (original) +++ branches/SuSE-Code-11-SP2-Branch/wagon/yast2-wagon.spec.in Tue Jun 14 10:50:33 2011 @@ -8,7 +8,8 @@ Requires: yast2-pkg-bindings >= 2.17.44 # Called in proposal and in code -Requires: yast2-packager yast2-add-on +Requires: yast2-packager >= 2.17.82 +Requires: yast2-add-on # Counting packages directly in packages proposal (BNC #573482) Requires: yast2-update >= 2.17.19 -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org