Author: fehr Date: Thu Aug 4 14:31:24 2011 New Revision: 65208 URL: http://svn.opensuse.org/viewcvs/yast?rev=65208&view=rev Log: revert change for SLES11 SP2 accidentally done in SP1 branch Modified: branches/SuSE-Code-11-SP1-Branch/iscsi-server/VERSION branches/SuSE-Code-11-SP1-Branch/iscsi-server/package/yast2-iscsi-server.changes branches/SuSE-Code-11-SP1-Branch/iscsi-server/src/IscsiServer.ycp branches/SuSE-Code-11-SP1-Branch/iscsi-server/src/helps.ycp branches/SuSE-Code-11-SP1-Branch/iscsi-server/src/widgets.ycp Modified: branches/SuSE-Code-11-SP1-Branch/iscsi-server/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/iscsi-server/VERSION?rev=65208&r1=65207&r2=65208&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/iscsi-server/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/iscsi-server/VERSION Thu Aug 4 14:31:24 2011 @@ -1 +1 @@ -2.17.10 +2.17.8 Modified: branches/SuSE-Code-11-SP1-Branch/iscsi-server/package/yast2-iscsi-server.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/iscsi-server/package/yast2-iscsi-server.changes?rev=65208&r1=65207&r2=65208&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/iscsi-server/package/yast2-iscsi-server.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/iscsi-server/package/yast2-iscsi-server.changes Thu Aug 4 14:31:24 2011 @@ -1,22 +1,4 @@ ------------------------------------------------------------------- -Thu Aug 4 14:02:26 CEST 2011 - fehr@suse.de - -- do not remove tgt package, just stop and disable tgtd service, - this way possible tgt config files do not get lost (bnc#706580) -- 2.17.10 - -------------------------------------------------------------------- -Thu Jun 30 16:16:50 CEST 2011 - fehr@suse.de - -- fix typos in translatable texts (bnc#703125) - -------------------------------------------------------------------- -Mon May 16 11:29:53 CEST 2011 - fehr@suse.de - -- allow only integer values in lun input field (bnc#693683) -- 2.17.9 - -------------------------------------------------------------------- Tue Nov 3 12:52:14 CET 2009 - mzugec@suse.cz - export credentials for target (fate#301932) Modified: branches/SuSE-Code-11-SP1-Branch/iscsi-server/src/IscsiServer.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/iscsi-server/src/IscsiServer.ycp?rev=65208&r1=65207&r2=65208&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/iscsi-server/src/IscsiServer.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/iscsi-server/src/IscsiServer.ycp Thu Aug 4 14:31:24 2011 @@ -135,9 +135,7 @@ ); if (confirm){ - string service = "tgtd"; - if (Service::Status(service)==0) Service::Stop(service); - Service::Disable(service); + if (PackageSystem::PackageInstalled("tgt")) PackageSystem::DoRemove(["tgt"]); PackageSystem::DoInstall(["iscsitarget"]); if (PackageSystem::PackageInstalled("iscsitarget")) return true; else return false; Modified: branches/SuSE-Code-11-SP1-Branch/iscsi-server/src/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/iscsi-server/src/helps.ycp?rev=65208&r1=65207&r2=65208&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/iscsi-server/src/helps.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/iscsi-server/src/helps.ycp Thu Aug 4 14:31:24 2011 @@ -38,7 +38,7 @@ </p> "), - "save_configuration" : _("<p><b>Save</b> button will export some information about + "save_configuration" : _("<p><b>Save</b> button will export some informations about targets into selected file.</p>"), Modified: branches/SuSE-Code-11-SP1-Branch/iscsi-server/src/widgets.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/iscsi-server/src/widgets.ycp?rev=65208&r1=65207&r2=65208&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/iscsi-server/src/widgets.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/iscsi-server/src/widgets.ycp Thu Aug 4 14:31:24 2011 @@ -68,7 +68,6 @@ `Left( `HBox( `PushButton(`id(`ok), Label::OKButton() ), `PushButton(`id(`cancel), Label::CancelButton() ))) ); UI::OpenDialog(lun_dialog); - UI::ChangeWidget(`id(`lun), `ValidChars, "0123456789" ); symbol ret = `nil; while(ret != `ok && ret !=`cancel){ boolean enable=false; @@ -191,7 +190,7 @@ } else { - Popup::Warning(_("An error occurred while saving the file.")); + Popup::Warning(_("An error occured while saving the file.")); } } } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org