[yast-commit] r62608 - in /trunk/packager: VERSION package/yast2-packager.changes src/clients/inst_custom_packages.ycp src/clients/sw_single.ycp

Author: lslezak Date: Tue Oct 12 16:23:57 2010 New Revision: 62608 URL: http://svn.opensuse.org/viewcvs/yast?rev=62608&view=rev Log: - don't use obsoleted inst_packages.ycp client, use PackagesUI.ycp module instead (bnc#471490) - 2.20.3 Modified: trunk/packager/VERSION trunk/packager/package/yast2-packager.changes trunk/packager/src/clients/inst_custom_packages.ycp trunk/packager/src/clients/sw_single.ycp Modified: trunk/packager/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/VERSION?rev=62608&r1=62607&r2=62608&view=diff ============================================================================== --- trunk/packager/VERSION (original) +++ trunk/packager/VERSION Tue Oct 12 16:23:57 2010 @@ -1 +1 @@ -2.20.2 +2.20.3 Modified: trunk/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/package/yast2-packager.changes?rev=62608&r1=62607&r2=62608&view=diff ============================================================================== --- trunk/packager/package/yast2-packager.changes (original) +++ trunk/packager/package/yast2-packager.changes Tue Oct 12 16:23:57 2010 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Oct 12 13:32:37 UTC 2010 - lslezak@suse.cz + +- don't use obsoleted inst_packages.ycp client, use PackagesUI.ycp + module instead (bnc#471490) +- 2.20.3 + +------------------------------------------------------------------- Tue Oct 12 09:39:59 UTC 2010 - lslezak@suse.cz - repo mgr: don't change URL when nothing has changed in the URL Modified: trunk/packager/src/clients/inst_custom_packages.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/clients/inst_custom_packages.ycp?rev=62608&r1=62607&r2=62608&view=diff ============================================================================== --- trunk/packager/src/clients/inst_custom_packages.ycp (original) +++ trunk/packager/src/clients/inst_custom_packages.ycp Tue Oct 12 16:23:57 2010 @@ -20,7 +20,7 @@ import "Installation"; import "GetInstArgs"; import "Mode"; - + import "PackagesUI"; list<string> packages = (list<string>)ProductFeatures::GetFeature("software", "packages"); @@ -57,9 +57,8 @@ y2error("Error solving package dependencies"); } } - - symbol result = (symbol)WFM::CallFunction( "inst_packages", [`summaryMode]); - y2milestone ("inst_packages returns %1", result); + symbol result = PackagesUI::RunPackageSelector($["mode" : `summaryMode]); + y2milestone ("Package selector returned: %1", result); if (result == `accept) result = `next; Modified: trunk/packager/src/clients/sw_single.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/clients/sw_single.ycp?rev=62608&r1=62607&r2=62608&view=diff ============================================================================== --- trunk/packager/src/clients/sw_single.ycp (original) +++ trunk/packager/src/clients/sw_single.ycp Tue Oct 12 16:23:57 2010 @@ -509,7 +509,7 @@ y2milestone("Using packager widget options: %1", opts); result = PackagesUI::RunPackageSelector(opts); // No: ask user via package selection widget - y2milestone ("inst_packages returns %1", result); + y2milestone ("Package selector retured: %1", result); if (result == `accept) { result = `next; @@ -592,10 +592,10 @@ // confirm removal by user (bnc#399795) if (action == `remove) { - map opts = $[ "dialog_type" : `summaryMode, "repo_mgmt" : true ]; + map opts = $[ "dialog_type" : `summaryMode, "repo_mgmt" : true ]; y2milestone("Using packager widget options: %1", opts); - result = (symbol)WFM::CallFunction( "inst_packages", [opts]); + result = PackagesUI::RunPackageSelector(opts); if (result != `accept) return `abort; @@ -607,9 +607,13 @@ } else { - result = (symbol)WFM::CallFunction( "inst_packages", [ $[ "dialog_type": `summaryMode, "repo_mgmt" : true] ]); // Ask user if conflicts - y2milestone ("inst_packages returns %1", result); - if (result == `accept) + // ask user if there is a problem + map opts = $[ "dialog_type" : `summaryMode, "repo_mgmt" : true ]; + + result = PackagesUI::RunPackageSelector(opts); + + y2milestone ("Packager returned: %1", result); + if (result == `accept) result = `next; } } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org