Author: lslezak Date: Mon Mar 30 15:02:00 2009 New Revision: 56460

URL: http://svn.opensuse.org/viewcvs/yast?rev=56460&view=rev Log: - sw_single - display the installation summary when there is something to install/remove at start (bnc#465194)

Modified: trunk/packager/package/yast2-packager.changes trunk/packager/src/clients/sw_single.ycp

Modified: trunk/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/package/yast2-packager.c... ============================================================================== --- trunk/packager/package/yast2-packager.changes (original) +++ trunk/packager/package/yast2-packager.changes Mon Mar 30 15:02:00 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Mar 30 14:41:21 CEST 2009 - lslezak@suse.cz + +- sw_single - display the installation summary when there is + something to install/remove at start (bnc#465194) + +------------------------------------------------------------------- Tue Mar 17 13:43:09 CET 2009 - lslezak@suse.cz

- Removed ZMD synchronization option, ZMD cannot sychronize

Modified: trunk/packager/src/clients/sw_single.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/clients/sw_single.yc... ============================================================================== --- trunk/packager/src/clients/sw_single.ycp (original) +++ trunk/packager/src/clients/sw_single.ycp Mon Mar 30 15:02:00 2009 @@ -310,7 +310,7 @@ return !max_is_installed; }

- map GetPackagerOptions() + map<string, any> GetPackagerOptions() { // defaults symbol mode = nil; @@ -340,16 +340,18 @@ // use default parameters for missing or invalid values if (mode == nil) { - mode = `searchMode; + // use summary mode if there is something to install (probably a suggested or recommended package) (bnc#465194) + Pkg::PkgSolve(true); // select the packages + mode = (Pkg::IsAnyResolvable(`any, `to_install) || Pkg::IsAnyResolvable(`any, `to_remove)) ? `summaryMode : `searchMode; } if (repo_management == nil) { repo_management = Mode::normal(); }

- map ret = $[ "dialog_type" : mode, "repo_mgmt" : repo_management ]; + map<string, any> ret = $[ "mode" : mode, "repo_mgmt" : repo_management ];

- y2milestone("inst_packages config: %1", ret); + y2milestone("PackagesUI::RunPackageSelector() options: %1", ret);

return ret; } @@ -426,10 +428,10 @@ // names of taboo packages list<string> taboo_packages = Pkg::GetPackages(`taboo, true);

- map opts = GetPackagerOptions(); + map<string,any> opts = GetPackagerOptions(); y2milestone("Using packager widget options: %1", opts);

- result = (symbol)WFM::CallFunction( "inst_packages", [opts]); // No: ask user via package selection widget + result = PackagesUI::RunPackageSelector(opts); // No: ask user via package selection widget y2milestone ("inst_packages returns %1", result); if (result == `accept) {