Author: gs Date: Tue Jun 7 14:50:58 2011 New Revision: 64255 URL: http://svn.opensuse.org/viewcvs/yast?rev=64255&view=rev Log: reset redo list and modified flag Modified: trunk/fcoe-client/src/FcoeClient.ycp trunk/fcoe-client/src/complex.ycp trunk/fcoe-client/src/inst_fcoe-client.ycp Modified: trunk/fcoe-client/src/FcoeClient.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/fcoe-client/src/FcoeClient.ycp?rev=64255&r1=64254&r2=64255&view=diff ============================================================================== --- trunk/fcoe-client/src/FcoeClient.ycp (original) +++ trunk/fcoe-client/src/FcoeClient.ycp Tue Jun 7 14:50:58 2011 @@ -630,6 +630,11 @@ return redo_list; } +global void ResetRedoCommands() +{ + redo_list = []; +} + global boolean WriteFcoeConfig() { boolean ret = true; @@ -845,7 +850,7 @@ // write settings if(PollAbort()) return false; Progress::NextStage(); - + boolean success = WriteFcoeConfig(); /* Error message */ if( !success ) Report::Error (_("Cannot write settings to /etc/fcoe/config.")); Modified: trunk/fcoe-client/src/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/fcoe-client/src/complex.ycp?rev=64255&r1=64254&r2=64255&view=diff ============================================================================== --- trunk/fcoe-client/src/complex.ycp (original) +++ trunk/fcoe-client/src/complex.ycp Tue Jun 7 14:50:58 2011 @@ -46,6 +46,9 @@ /** * Show a popup on abort if data are modified and * check redo list/execute redo commands. + * This function is also called during installation if user aborts + * the 'FCoE client configuration', i.e. commands from redo list + * are executed and list is reset. * @return true if users aborts installation */ boolean ReallyAbort() { @@ -70,6 +73,7 @@ y2milestone( "Output: %1", output ); } ); + FcoeClient::ResetRedoCommands(); // important during installation } } return abort; Modified: trunk/fcoe-client/src/inst_fcoe-client.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/fcoe-client/src/inst_fcoe-client.ycp?rev=64255&r1=64254&r2=64255&view=diff ============================================================================== --- trunk/fcoe-client/src/inst_fcoe-client.ycp (original) +++ trunk/fcoe-client/src/inst_fcoe-client.ycp Tue Jun 7 14:50:58 2011 @@ -85,17 +85,21 @@ ret = MainSequence(); y2milestone("MainSequence ret=%1", ret); -// add package open-fcoe to pool that is then used by software proposal -// to propose a selection -PackagesProposal::AddResolvables( "fcoe", `package, ["open-fcoe"] ); - // workflow not aborted if ( ret == `next ) { + // add package open-fcoe to the pool that is used by software proposal + y2milestone( "Adding package open-fcoe to pool" ); + PackagesProposal::AddResolvables( "fcoe", `package, ["open-fcoe"] ); // write changes to config files + y2milestone( "Writing config files"); FcoeClient::WriteFcoeConfig(); FcoeClient::WriteCfgFiles(); + // restart fcoemon + y2milestone( "Restarting FCoE" ); FcoeClient::RestartServiceFcoe(); + // reset modified flag + FcoeClient::SetModified( false ); } /* Finish */ -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org