Author: lslezak Date: Mon Jun 6 15:14:08 2011 New Revision: 64223 URL: http://svn.opensuse.org/viewcvs/yast?rev=64223&view=rev Log: first step - propose download in advance mode according to free disk space, display the result in the migration proposal Modified: branches/tmp/lslezak/SP2/wagon/src/clients/wagon_update_proposal.ycp branches/tmp/lslezak/SP2/wagon/src/modules/Wagon.ycp Modified: branches/tmp/lslezak/SP2/wagon/src/clients/wagon_update_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/SP2/wagon/src/clients/wagon_update_proposal.ycp?rev=64223&r1=64222&r2=64223&view=diff ============================================================================== --- branches/tmp/lslezak/SP2/wagon/src/clients/wagon_update_proposal.ycp (original) +++ branches/tmp/lslezak/SP2/wagon/src/clients/wagon_update_proposal.ycp Mon Jun 6 15:14:08 2011 @@ -40,6 +40,7 @@ } Wagon::ProposeDUP(); + Wagon::ProposeDownloadMode(); ret = Wagon::ProposalSummary(); Modified: branches/tmp/lslezak/SP2/wagon/src/modules/Wagon.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/SP2/wagon/src/modules/Wagon.ycp?rev=64223&r1=64222&r2=64223&view=diff ============================================================================== --- branches/tmp/lslezak/SP2/wagon/src/modules/Wagon.ycp (original) +++ branches/tmp/lslezak/SP2/wagon/src/modules/Wagon.ycp Mon Jun 6 15:14:08 2011 @@ -31,6 +31,7 @@ import "Update"; import "FileUtils"; import "String"; + import "Packages"; boolean running_by_applet = false; @@ -75,6 +76,8 @@ return update_workflow_type; } + global boolean download_in_advance = nil; + string migration_method = nil; global string migration_method_file = sformat ("%1/wagon_migration_method", Directory::vardir); @@ -379,6 +382,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 (download_in_advance == nil) + { + map dwspace = CheckDownloadSpace(); + + download_in_advance = dwspace["result"]:nil == `ok; + y2milestone("Proposed download in advance mode: %1", download_in_advance); + } + } + global map MinimizeProductMap (map product) { if (haskey (product, "license")) product["license"] = "..."; if (haskey (product, "description")) product["description"] = "..."; @@ -510,9 +575,12 @@ ret = "<ul>\n" + ret + "</ul>\n"; + ret = ret + "<ul><li>\n" + _("Download all packages before upgrade: ") + + (download_in_advance ? _("Enabled") : _("Disabled")) + "</li></ul>\n"; + map summary = $[ "preformatted_proposal" : ret, - // help text + // 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>"), ]; -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org