[yast-commit] r39393 - in /trunk/online-update: VERSION package/yast2-online-update.changes src/inst_you.ycp
![](https://seccdn.libravatar.org/avatar/ccabc6c04379b11d036b089b67199614.jpg?s=120&d=mm&r=g)
Author: jsuchome Date: Fri Jul 13 12:55:53 2007 New Revision: 39393 URL: http://svn.opensuse.org/viewcvs/yast?rev=39393&view=rev Log: - fixed restarting during installation (#291361) - 2.15.19 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=39393&r1=39392&r2=39393&view=diff ============================================================================== --- trunk/online-update/VERSION (original) +++ trunk/online-update/VERSION Fri Jul 13 12:55:53 2007 @@ -1 +1 @@ -2.15.18 +2.15.19 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=39393&r1=39392&r2=39393&view=diff ============================================================================== --- trunk/online-update/package/yast2-online-update.changes (original) +++ trunk/online-update/package/yast2-online-update.changes Fri Jul 13 12:55:53 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Jul 13 12:39:33 CEST 2007 - jsuchome@suse.cz + +- fixed restarting during installation (#291361) +- 2.15.19 + +------------------------------------------------------------------- Fri Jul 13 08:57:21 CEST 2007 - jsuchome@suse.cz - removed duplicated entries from desktop files Modified: trunk/online-update/src/inst_you.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/online-update/src/inst_you.ycp?rev=39393&r1=39392&r2=39393&view=diff ============================================================================== --- trunk/online-update/src/inst_you.ycp (original) +++ trunk/online-update/src/inst_you.ycp Fri Jul 13 12:55:53 2007 @@ -23,7 +23,7 @@ import "Wizard"; string saved_path = Directory::vardir + "/selected_patches.ycp"; - string restart_data_file = Directory::vardir + "/continue_installation"; + string restarted_path = Directory::vardir + "/continue_you"; /* Called backwards */ if(GetInstArgs::going_back()) @@ -33,16 +33,11 @@ } boolean after_restart = false; - if (FileUtils::Exists (restart_data_file)) + if (FileUtils::Exists (restarted_path)) { - map restarting_step = ProductControl::RestartingStep (); - y2milestone ("restarting_step: %1", restarting_step); - if (restarting_step == nil || // 'fix' for bug #184452 - restarting_step["name"]:"" == "you") - { - y2milestone ("installation restarted from YOU"); - after_restart = true; - } + y2milestone ("installation restarted from YOU"); + SCR::Execute (.target.remove, restarted_path); + after_restart = true; } if (!Internet::do_you && !after_restart) // nothing to do @@ -280,6 +275,7 @@ else if (ret == `restart_same_step) { Popup::Message (OnlineUpdate::restart_message); + SCR::Write (.target.ycp, restarted_path, 1); } if (!already_up) -- 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