Author: lslezak Date: Tue Dec 30 12:13:24 2008 New Revision: 54345 URL: http://svn.opensuse.org/viewcvs/yast?rev=54345&view=rev Log: - display the Package selector instead of the Pattern selector if there is a resolver problem during installation/update, display the conflicts immeditely (bnc#436721) Modified: trunk/packager/package/yast2-packager.changes trunk/packager/src/clients/inst_sw_select.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 Tue Dec 30 12:13:24 2008 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Dec 30 11:48:28 CET 2008 - lslezak@suse.cz + +- display the Package selector instead of the Pattern selector + if there is a resolver problem during installation/update, + display the conflicts immeditely (bnc#436721) + +------------------------------------------------------------------- Tue Dec 23 09:46:51 CET 2008 - lslezak@suse.cz - repositories.ycp - configure 'keeppackages' repository option Modified: trunk/packager/src/clients/inst_sw_select.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/clients/inst_sw_sele... ============================================================================== --- trunk/packager/src/clients/inst_sw_select.ycp (original) +++ trunk/packager/src/clients/inst_sw_select.ycp Tue Dec 30 12:13:24 2008 @@ -20,6 +20,7 @@ textdomain "packager"; import "Packages"; + import "PackagesUI"; symbol ret = `again; @@ -32,7 +33,18 @@ while ( ret == `again ) { - ret = (symbol)WFM::CallFunction( "inst_packages", [] ); + // display the installation summary in case there is a solver problem (bnc#436721) + if (Packages::solve_errors > 0) + { + y2milestone("Unresolved conflicts, using summary mode"); + ret = PackagesUI::RunPackageSelector($["mode" : `summaryMode]); + } + else + { + ret = PackagesUI::RunPatternSelector(); + } + + y2milestone("Package selector result: %1", ret); if ( ret == `accept ) { -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org