Author: locilka Date: Mon Feb 2 13:12:35 2009 New Revision: 55179 URL: http://svn.opensuse.org/viewcvs/yast?rev=55179&view=rev Log: - Erasing all old additional control files in the final step of upgrade before rebooting to the second stage (bnc #471454). Modified: trunk/installation/package/yast2-installation.changes trunk/installation/src/inst_finish/copy_files_finish.ycp trunk/installation/src/modules/InstError.ycp Modified: trunk/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-installation.changes?rev=55179&r1=55178&r2=55179&view=diff ============================================================================== --- trunk/installation/package/yast2-installation.changes (original) +++ trunk/installation/package/yast2-installation.changes Mon Feb 2 13:12:35 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Feb 2 13:09:08 CET 2009 - locilka@suse.cz + +- Erasing all old additional control files in the final step of + upgrade before rebooting to the second stage (bnc #471454). + +------------------------------------------------------------------- Wed Jan 28 14:33:09 CET 2009 - locilka@suse.cz - Added new InstError module for unified reporting of errors Modified: trunk/installation/src/inst_finish/copy_files_finish.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/inst_finish/copy_files_finish.ycp?rev=55179&r1=55178&r2=55179&view=diff ============================================================================== --- trunk/installation/src/inst_finish/copy_files_finish.ycp (original) +++ trunk/installation/src/inst_finish/copy_files_finish.ycp Mon Feb 2 13:12:35 2009 @@ -65,9 +65,12 @@ SCR::Write (.target.ycp, Installation::destdir + Directory::etcdir + "/control_files/order.ycp", workflows_list); - SCR::Execute (.target.bash, "/bin/mkdir -p " + - "'" + String::Quote (Installation::destdir) + Directory::etcdir + "/control_files'"); + // Remove the directory with all additional control files (if exists) + // and create it again (empty). BNC #471454 + SCR::Execute (.target.bash, sformat ("rm -rf '%1'; /bin/mkdir -p '%1'", + String::Quote (Installation::destdir + Directory::etcdir + "/control_files"))); + // Now copy all the additional control files to the just installed system foreach (string file, WorkflowManager::GetAllUsedControlFiles(), { SCR::Execute (.target.bash, "/bin/cp '" + String::Quote (file) + "' " + "'" + String::Quote (Installation::destdir) + Directory::etcdir + "/control_files/'"); Modified: trunk/installation/src/modules/InstError.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/modules/InstError.ycp?rev=55179&r1=55178&r2=55179&view=diff ============================================================================== --- trunk/installation/src/modules/InstError.ycp (original) +++ trunk/installation/src/modules/InstError.ycp Mon Feb 2 13:12:35 2009 @@ -55,7 +55,11 @@ ))) ) ), - `ButtonBox (`PushButton (`id(`ok), Label::OKButton())) + `ButtonBox ( + // FIXME: BNC #422612, Use `opt(`noSanityCheck) later + `PushButton (`id(`save_y2logs), `opt(`cancelButton), _("&Save YaST Logs...")), + `PushButton (`id(`ok), Label::OKButton()) + ) )); if (success != true) { -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org