[yast-commit] r55502 - in /trunk/online-update: package/yast2-online-update.changes src/inst_you.ycp
Author: jsuchome Date: Fri Feb 13 15:59:43 2009 New Revision: 55502 URL: http://svn.opensuse.org/viewcvs/yast?rev=55502&view=rev Log: - correct placing of solver call (bnc#474601) Modified: trunk/online-update/package/yast2-online-update.changes trunk/online-update/src/inst_you.ycp Modified: trunk/online-update/package/yast2-online-update.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/online-update/package/yast2-online-update.changes?rev=55502&r1=55501&r2=55502&view=diff ============================================================================== --- trunk/online-update/package/yast2-online-update.changes (original) +++ trunk/online-update/package/yast2-online-update.changes Fri Feb 13 15:59:43 2009 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Fri Feb 13 15:59:20 CET 2009 - jsuchome@suse.cz + +- correct placing of solver call (bnc#474601) + +------------------------------------------------------------------- Wed Feb 11 17:47:24 CET 2009 - locilka@suse.cz - Calling solver if some patches are selected during second stage Modified: trunk/online-update/src/inst_you.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/online-update/src/inst_you.ycp?rev=55502&r1=55501&r2=55502&view=diff ============================================================================== --- trunk/online-update/src/inst_you.ycp (original) +++ trunk/online-update/src/inst_you.ycp Fri Feb 13 15:59:43 2009 @@ -137,7 +137,8 @@ "ignoreAlreadyRecommended" : true, "onlyRequires" : true ]); - boolean solved = Pkg::PkgSolve (true); + // first solver run, so preselecting works well + Pkg::PkgSolve (true); // select the patches affecting pkg management selected = Pkg::ResolvablePreselectPatches (`affects_pkg_manager); @@ -153,6 +154,8 @@ selected = Pkg::ResolvablePreselectPatches (`all); y2milestone ("All preselected patches: %1", selected); } + // solver must be run after preselction (bnc#474601) + boolean solved = Pkg::PkgSolve (true); // run package selector to allow user interaction if (!solved || @@ -287,20 +290,6 @@ } } - // 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
participants (1)
-
jsuchome@svn.opensuse.org