[yast-commit] r53378 - in /trunk/add-on: VERSION package/yast2-add-on.changes src/add-on-workflow.ycp

Author: locilka Date: Tue Nov 18 12:53:44 2008 New Revision: 53378 URL: http://svn.opensuse.org/viewcvs/yast?rev=53378&view=rev Log: - Listing only type=="addon" products (bnc #441984). - Informing user what is going to happen after removing an add-on product (bnc #441984). - 2.17.11 Modified: trunk/add-on/VERSION trunk/add-on/package/yast2-add-on.changes trunk/add-on/src/add-on-workflow.ycp Modified: trunk/add-on/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on/VERSION?rev=53378&r1=53377&r2=53378&view=diff ============================================================================== --- trunk/add-on/VERSION (original) +++ trunk/add-on/VERSION Tue Nov 18 12:53:44 2008 @@ -1 +1 @@ -2.17.10 +2.17.11 Modified: trunk/add-on/package/yast2-add-on.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on/package/yast2-add-on.changes?rev=53378&r1=53377&r2=53378&view=diff ============================================================================== --- trunk/add-on/package/yast2-add-on.changes (original) +++ trunk/add-on/package/yast2-add-on.changes Tue Nov 18 12:53:44 2008 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Tue Nov 18 12:45:49 CET 2008 - locilka@suse.cz + +- Listing only type=="addon" products (bnc #441984). +- Informing user what is going to happen after removing an add-on + product (bnc #441984). +- 2.17.11 + +------------------------------------------------------------------- Fri Nov 7 17:34:05 CET 2008 - locilka@suse.cz - Checking download files signatures (bnc #409927). Modified: trunk/add-on/src/add-on-workflow.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on/src/add-on-workflow.ycp?rev=53378&r1=53377&r2=53378&view=diff ============================================================================== --- trunk/add-on/src/add-on-workflow.ycp (original) +++ trunk/add-on/src/add-on-workflow.ycp Tue Nov 18 12:53:44 2008 @@ -33,6 +33,7 @@ import "GetInstArgs"; import "Installation"; import "PackageCallbacks"; +import "PackagesUI"; include "packager/inst_source_dialogs.ycp"; include "packager/repositories_include.ycp"; @@ -1114,6 +1115,7 @@ %2 %3 %4</p>", + sformat ( _("<b>Vendor:</b> %1<br>"), pi["product","vendor"]:_("Unknown vendor") @@ -1147,8 +1149,8 @@ product_infos = $[]; foreach (map one_product, all_products, { - if (one_product["category"]:"unknown" == "base") { - y2milestone ("Skipping base product: %1", one_product["display_name"]:one_product["name"]:""); + if (one_product["type"]:"addon" != "addon") { + y2milestone ("Skipping product: %1", one_product["display_name"]:one_product["name"]:""); continue; } @@ -1157,14 +1159,21 @@ counter = counter + 1; repository_info = Pkg::SourceGeneralData (one_product["source"]:-1); + if (repository_info == nil) { + repository_info = $[]; + } - y2milestone ("Product: %1, Info: %2", one_product, repository_info); + //y2milestone ("Product: %1, Info: %2", one_product, repository_info); product_infos[tostring(counter)] = $[ "product" : one_product, "repository" : repository_info, ]; + if (! haskey (repository_info, "base_urls")) { + repository_info["base_urls"] = []; + } + products = add (products, `item ( `id (sformat ("product_%1", counter)), one_product["display_name"]:one_product["name"]:_("Unknown product"), @@ -1181,13 +1190,9 @@ boolean RunPackageSelector () { boolean solve_ret = Pkg::PkgSolve (false); - y2milestone ("Calling Solve() retutned: %1", solve_ret); - - map opts = $[ "dialog_type" : `summaryMode, "repo_mgmt" : true ]; + y2milestone ("Calling Solve() returned: %1", solve_ret); - y2milestone ("Running inst_packages: Using packager widget options: %1", opts); - symbol result = (symbol) WFM::CallFunction ("inst_packages", [opts]); - y2milestone ("inst_packages returned: %1", result); + symbol result = PackagesUI::RunPackageSelector ($["mode":`summaryMode]); if (result == `accept) { y2milestone ("Calling inst_rpmcopy"); @@ -1211,7 +1216,17 @@ } string product_name = pi["product","display_name"]:pi["product","name"]:_("Unknown product"); - if (! Confirm::Delete (product_name)) { + + if (! Popup::AnyQuestion ( + Label::WarningMsg(), + sformat (_("Deleting the add-on product %1 may result in removing all the packages +installed from this add-on. + +Are sure you want to delete it?"), product_name), + Label::DeleteButton (), + Label::CancelButton (), + `focus_no + )) { y2milestone ("Deleting '%1' canceled", product_name); return false; } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org