Author: locilka Date: Thu Jun 7 15:15:47 2007 New Revision: 38338 URL: http://svn.opensuse.org/viewcvs/yast?rev=38338&view=rev Log: - A new label "Writing YaST Configuration..." used in case of restarting system or installation. Modified: trunk/installation/package/yast2-installation.changes trunk/installation/src/clients/inst_worker_continue.ycp trunk/installation/src/clients/inst_worker_initial.ycp trunk/installation/src/include/inst_inc_all.ycp Modified: trunk/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-installation.changes?rev=38338&r1=38337&r2=38338&view=diff ============================================================================== --- trunk/installation/package/yast2-installation.changes (original) +++ trunk/installation/package/yast2-installation.changes Thu Jun 7 15:15:47 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Jun 7 15:08:08 CEST 2007 - locilka@suse.cz + +- A new label "Writing YaST Configuration..." used in case of + restarting system or installation. + +------------------------------------------------------------------- Fri Jun 1 12:41:10 CEST 2007 - mzugec@suse.cz - use shared isNetworkRunning() function in network_finish Modified: trunk/installation/src/clients/inst_worker_continue.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/inst_worker_continue.ycp?rev=38338&r1=38337&r2=38338&view=diff ============================================================================== --- trunk/installation/src/clients/inst_worker_continue.ycp (original) +++ trunk/installation/src/clients/inst_worker_continue.ycp Thu Jun 7 15:15:47 2007 @@ -81,6 +81,9 @@ if (FileUtils::Exists (Installation::restart_data_file)) { string contents = (string) SCR::Read (.target.string, Installation::restart_data_file); + // file will be created if it is needed + y2milestone ("Removing %1 file containing %2", Installation::restart_data_file, contents); + list<string> contents_lines = splitstring (contents, "\n"); integer next_step = tointeger ((string)(contents_lines[0]:nil)); integer restarting_step = tointeger ((string)(contents_lines[1]:nil)); @@ -141,7 +144,7 @@ } // All Sources and Target need to be released... - FinishInstallation(); + FinishInstallation (ret); // Created UI needs to be destroyed UI::CloseDialog(); Modified: trunk/installation/src/clients/inst_worker_initial.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/inst_worker_initial.ycp?rev=38338&r1=38337&r2=38338&view=diff ============================================================================== --- trunk/installation/src/clients/inst_worker_initial.ycp (original) +++ trunk/installation/src/clients/inst_worker_initial.ycp Thu Jun 7 15:15:47 2007 @@ -87,7 +87,7 @@ } // All Sources and Target need to be released... - FinishInstallation(); + FinishInstallation (ret); // Created UI needs to be destroyed UI::CloseDialog(); Modified: trunk/installation/src/include/inst_inc_all.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/include/inst_inc_all.ycp?rev=38338&r1=38337&r2=38338&view=diff ============================================================================== --- trunk/installation/src/include/inst_inc_all.ycp (original) +++ trunk/installation/src/include/inst_inc_all.ycp Thu Jun 7 15:15:47 2007 @@ -39,11 +39,18 @@ SetInitializingUI (); } - void FinishInstallation () { + void FinishInstallation (symbol ret) { y2milestone("Finishing the installation..."); - // TRANSLATORS: busy message - UI::OpenDialog (`Label(_("Finishing the installation..."))); // #2 - // disable all sources and finish target + + if (ret == `reboot || ret == `restart_yast || ret == `restart_same_step) { + // TRANSLATORS: busy message + UI::OpenDialog (`Label(_("Finishing the installation..."))); // #2 + } else { + // TRANSLATORS: busy message + UI::OpenDialog (`Label(_("Writing YaST Configuration..."))); // #2 + } + + // disable all sources and finish target Pkg::SourceFinishAll(); // but see also inst_congratulate, #165860 Pkg::TargetFinish(); UI::CloseDialog(); // #2 -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org