Author: mzugec Date: Thu Jul 10 13:00:13 2008 New Revision: 48951 URL: http://svn.opensuse.org/viewcvs/yast?rev=48951&view=rev Log: fixed text in Write dialog (bnc#393929) Modified: trunk/iscsi-client/src/IscsiClient.ycp Modified: trunk/iscsi-client/src/IscsiClient.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/iscsi-client/src/IscsiClient.ycp?rev=48951&r1=48950&r2=48951&view=diff ============================================================================== --- trunk/iscsi-client/src/IscsiClient.ycp (original) +++ trunk/iscsi-client/src/IscsiClient.ycp Thu Jul 10 13:00:13 2008 @@ -219,49 +219,41 @@ string caption = _("Saving iSCSI Initiator Configuration"); // TODO FIXME And set the right number of stages - integer steps = 2; integer sl = 500; sleep(sl); - // TODO FIXME Names of real stages - // We do not set help text here, because it was set outside - Progress::New(caption, " ", steps, [ + list<string> descr = [ /* Progress stage 1/2 */ - _("Write the settings"), + _("Write the autoYaST settings"), /* Progress stage 2/2 */ - _("Run SuSEconfig") - ], [ - /* Progress step 1/2 */ - _("Writing the settings..."), - /* Progress step 2/2 */ - _("Running SuSEconfig..."), - /* Progress finished */ - _("Finished") - ], - "" - ); + _("Set up service status") + ]; + if (!Mode::autoinst()) descr=remove(descr, 0); + // TODO FIXME Names of real stages + // We do not set help text here, because it was set outside + Progress::New(caption, " ", size(descr), descr, [], ""); - if(Abort()) return false; - Progress::NextStage(); - IscsiClientLib::autoyastPrepare(); -// if( return false; - sleep(sl); + if (Mode::autoinst()){ + if(Abort()) return false; + Progress::NextStage(); + IscsiClientLib::autoyastPrepare(); + IscsiClientLib::autoyastWrite(); + sleep(sl); + } if(Abort()) return false; Progress::NextStage (); -// if(! - IscsiClientLib::autoyastWrite(); -//) return false; + // set open-iscsi service status + if(!IscsiClientLib::setServiceStatus()) return false; sleep(sl); if(Abort()) return false; Progress::NextStage(); + if (Stage::initial() && size(IscsiClientLib::sessions)>0 ) + Packages::addAdditionalPackage("open-iscsi"); sleep(sl); - // set open-iscsi service status - if(!IscsiClientLib::setServiceStatus()) return false; - if (Stage::initial() && size(IscsiClientLib::sessions)>0 ) Packages::addAdditionalPackage("open-iscsi"); return true; } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org