Author: locilka Date: Thu Jul 12 09:46:15 2007 New Revision: 39335 URL: http://svn.opensuse.org/viewcvs/yast?rev=39335&view=rev Log: - Changed using temporary files handling to prevent from collisions (Partly #285920). - 2.15.2 Modified: trunk/runlevel/VERSION trunk/runlevel/package/yast2-runlevel.changes trunk/runlevel/src/ui.ycp Modified: trunk/runlevel/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/runlevel/VERSION?rev=39335&r1=39334&r2=39335&view=diff ============================================================================== --- trunk/runlevel/VERSION (original) +++ trunk/runlevel/VERSION Thu Jul 12 09:46:15 2007 @@ -1 +1 @@ -2.15.1 +2.15.2 Modified: trunk/runlevel/package/yast2-runlevel.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/runlevel/package/yast2-runlevel.changes?rev=39335&r1=39334&r2=39335&view=diff ============================================================================== --- trunk/runlevel/package/yast2-runlevel.changes (original) +++ trunk/runlevel/package/yast2-runlevel.changes Thu Jul 12 09:46:15 2007 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Jul 12 09:44:41 CEST 2007 - locilka@suse.cz + +- Changed using temporary files handling to prevent from collisions + (Partly #285920). +- 2.15.2 + +------------------------------------------------------------------- Fri May 25 13:30:04 CEST 2007 - jsrain@suse.cz - removed outdated translations from .desktop-files (#271209) Modified: trunk/runlevel/src/ui.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/runlevel/src/ui.ycp?rev=39335&r1=39334&r2=39335&view=diff ============================================================================== --- trunk/runlevel/src/ui.ycp (original) +++ trunk/runlevel/src/ui.ycp Thu Jul 12 09:46:15 2007 @@ -27,6 +27,7 @@ import "Label"; import "Popup"; import "FileUtils"; + import "String"; define string StartedText (integer started); define string BstatusText (boolean disabled, integer started); @@ -184,8 +185,13 @@ define void changeService1 (map service) ``{ if (service["started"]:-1 < 0) { - integer started = Service::RunInitScriptWithTimeOut (current_service, - "status" + sformat(" 2>&1 1>%1/runlevel_out", SCR::Read(.target.tmpdir))); + string outfile = sformat ("'%1/runlevel_out_%2'", SCR::Read(.target.tmpdir), String::Quote(current_service)); + + integer started = Service::RunInitScriptWithTimeOut ( + current_service, + "status" + sformat(" 2>&1 1>%1", outfile) + ); + service["started"] = started; RunlevelEd::services[current_service] = service; updateStatusColumn (current_service, started); @@ -507,8 +513,12 @@ */ define void updateServiceStatus (boolean use_func, string service_name) ``{ if (RunlevelEd::services[service_name, "started"]:-1 < 0) { - integer started = Service::RunInitScriptWithTimeOut (service_name, - "status" + sformat(" 2>&1 1>%1/runlevel_out", SCR::Read(.target.tmpdir))); + string file_out = sformat ("'%1/runlevel_out_%2'", SCR::Read (.target.tmpdir), String::Quote (service_name)); + + integer started = Service::RunInitScriptWithTimeOut ( + service_name, + "status" + sformat (" 2>&1 1>%1", file_out) + ); RunlevelEd::services[service_name, "started"] = started; @@ -842,7 +852,6 @@ return ModifyServiceDep (service_name, [], enable, false, true); } - /** * Starts/stops/checks status of a service * @param service_name service to start/stop @@ -853,7 +862,9 @@ string command) ``{ UI::OpenDialog (`Label (service_name + " " + command)); y2milestone("%1 -> %2", service_name, command); - string log_filename = sformat("%1/runlevel_out", (string) SCR::Read(.target.tmpdir)); + + string log_filename = sformat ("'%1/runlevel_out_%2'", (string) SCR::Read(.target.tmpdir), String::Quote(service_name)); + integer cmd_run = Service::RunInitScriptWithTimeOut ( service_name, command + sformat(" 2>&1 1>%1", log_filename) -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org