Author: lslezak Date: Mon Apr 19 09:30:43 2010 New Revision: 61741 URL: http://svn.opensuse.org/viewcvs/yast?rev=61741&view=rev Log: - switch pkg manager to summary mode after resolving pkg conflicts (bnc#596519) - 2.19.5 Modified: trunk/packager/VERSION trunk/packager/package/yast2-packager.changes trunk/packager/src/clients/sw_single.ycp Modified: trunk/packager/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/VERSION?rev=61741&r1=61740&r2=61741&view=diff ============================================================================== --- trunk/packager/VERSION (original) +++ trunk/packager/VERSION Mon Apr 19 09:30:43 2010 @@ -1 +1 @@ -2.19.4 +2.19.5 Modified: trunk/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/package/yast2-packager.changes?rev=61741&r1=61740&r2=61741&view=diff ============================================================================== --- trunk/packager/package/yast2-packager.changes (original) +++ trunk/packager/package/yast2-packager.changes Mon Apr 19 09:30:43 2010 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Apr 19 07:27:40 UTC 2010 - lslezak@suse.cz + +- switch pkg manager to summary mode after resolving pkg conflicts + (kmachalkova@novell.com)(bnc#596519) +- 2.19.5 + +------------------------------------------------------------------- Mon Apr 12 12:26:42 UTC 2010 - lslezak@suse.cz - added a nil check in InstURL.ycp so the testsuite passes Modified: trunk/packager/src/clients/sw_single.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/clients/sw_single.ycp?rev=61741&r1=61740&r2=61741&view=diff ============================================================================== --- trunk/packager/src/clients/sw_single.ycp (original) +++ trunk/packager/src/clients/sw_single.ycp Mon Apr 19 09:30:43 2010 @@ -595,7 +595,7 @@ } else { - result = (symbol)WFM::CallFunction( "inst_packages", [ $["repo_mgmt" : true] ]); // Ask user if conflicts + 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) result = `next; -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org