Author: locilka Date: Wed Feb 11 17:52:13 2009 New Revision: 55436 URL: http://svn.opensuse.org/viewcvs/yast?rev=55436&view=rev Log: - Calling solver if some patches are selected during second stage installation (bnc #474601). - 2.17.17 Modified: branches/SuSE-Code-11-Branch/online-update/VERSION branches/SuSE-Code-11-Branch/online-update/package/yast2-online-update.changes branches/SuSE-Code-11-Branch/online-update/src/inst_you.ycp Modified: branches/SuSE-Code-11-Branch/online-update/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/online-update/VERSION?rev=55436&r1=55435&r2=55436&view=diff ============================================================================== --- branches/SuSE-Code-11-Branch/online-update/VERSION (original) +++ branches/SuSE-Code-11-Branch/online-update/VERSION Wed Feb 11 17:52:13 2009 @@ -1 +1 @@ -2.17.16 +2.17.17 Modified: branches/SuSE-Code-11-Branch/online-update/package/yast2-online-update.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/online-update/package/yast2-online-update.changes?rev=55436&r1=55435&r2=55436&view=diff ============================================================================== --- branches/SuSE-Code-11-Branch/online-update/package/yast2-online-update.changes (original) +++ branches/SuSE-Code-11-Branch/online-update/package/yast2-online-update.changes Wed Feb 11 17:52:13 2009 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Feb 11 17:47:24 CET 2009 - locilka@suse.cz + +- Calling solver if some patches are selected during second stage + installation (bnc #474601). +- 2.17.17 + +------------------------------------------------------------------- Wed Feb 11 13:40:53 CET 2009 - jsuchome@suse.cz - refresh the source data which were possibly cleared (bnc#474711) Modified: branches/SuSE-Code-11-Branch/online-update/src/inst_you.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/online-update/src/inst_you.ycp?rev=55436&r1=55435&r2=55436&view=diff ============================================================================== --- branches/SuSE-Code-11-Branch/online-update/src/inst_you.ycp (original) +++ branches/SuSE-Code-11-Branch/online-update/src/inst_you.ycp Wed Feb 11 17:52:13 2009 @@ -286,6 +286,21 @@ } } } + + // BNC #474601, Solver run after selecting patches is required + if (! Pkg::PkgSolve (true)) + { + y2warning ("Cannot solve automatically, user decision required"); + + symbol ret_sel = PackagesUI::RunPackageSelector($["mode":`youMode]); + if (ret_sel == `cancel) + { + y2milestone ("package selector canceled -> `next"); + Pkg::SetSolverFlags (solver_flags_backup); + return `next; + } + } + // install the patches OnlineUpdateCallbacks::RegisterOnlineUpdateCallbacks(); WFM::call( "online_update_install" ); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org