Author: jsuchome Date: Fri Apr 8 12:55:38 2011 New Revision: 63751 URL: http://svn.opensuse.org/viewcvs/yast?rev=63751&view=rev Log: - initialize package management after reboot (bnc#672966) - 2.21.0 Modified: trunk/online-update/VERSION trunk/online-update/package/yast2-online-update.changes trunk/online-update/src/inst_you.ycp Modified: trunk/online-update/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/online-update/VERSION?rev=63751&r1=63750&r2=63751&view=diff ============================================================================== --- trunk/online-update/VERSION (original) +++ trunk/online-update/VERSION Fri Apr 8 12:55:38 2011 @@ -1 +1 @@ -2.20.2 +2.21.0 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=63751&r1=63750&r2=63751&view=diff ============================================================================== --- trunk/online-update/package/yast2-online-update.changes (original) +++ trunk/online-update/package/yast2-online-update.changes Fri Apr 8 12:55:38 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Apr 8 12:54:35 CEST 2011 - jsuchome@suse.cz + +- initialize package management after reboot (bnc#672966) +- 2.21.0 + +------------------------------------------------------------------- Thu Jan 20 14:43:08 CET 2011 - jsuchome@suse.cz - run repositories module for adding update source (bnc#658711) Modified: trunk/online-update/src/inst_you.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/online-update/src/inst_you.ycp?rev=63751&r1=63750&r2=63751&view=diff ============================================================================== --- trunk/online-update/src/inst_you.ycp (original) +++ trunk/online-update/src/inst_you.ycp Fri Apr 8 12:55:38 2011 @@ -34,11 +34,14 @@ } boolean after_restart = false; + boolean after_reboot = false; if (FileUtils::Exists (restarted_path)) { - y2milestone ("installation restarted from YOU"); - SCR::Execute (.target.remove, restarted_path); + string action = (string) SCR::Read (.target.ycp, restarted_path); + y2milestone ("installation restarted from YOU (%1)", action); after_restart = true; + after_reboot = (action == "reboot"); + SCR::Execute (.target.remove, restarted_path); } if (!Internet::do_you && !after_restart) // nothing to do @@ -156,6 +159,12 @@ // solver must be run after preselction (bnc#474601) boolean solved = Pkg::PkgSolve (true); + if (selected < 1 && after_reboot) + { + y2milestone ("no patch available after reboot, skiping inst_you"); + return `auto; + } + // run package selector to allow user interaction if (!solved || ProductFeatures::GetBooleanFeature("globals", "manual_online_update") || @@ -302,10 +311,11 @@ if (more_patches_needed) { y2milestone ("there are more patches to install after reboot..."); - // after reboot, run the online update again - ret = `reboot_same_step; - SCR::Write (.target.ycp, restarted_path, 1); } + // after reboot, run the online update again + // (even if no patches remain, to init Pkg before going on (see bnc#672966) + ret = `reboot_same_step; + SCR::Write (.target.ycp, restarted_path, "reboot"); } else if (ret == `restart_same_step) { @@ -313,7 +323,7 @@ if (more_patches_needed) { y2milestone ("restarting YaST, expecting another patches in the next YOU run"); - SCR::Write (.target.ycp, restarted_path, 1); + SCR::Write (.target.ycp, restarted_path, "restart"); } else { -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org