Author: ug Date: Wed Jan 2 13:27:25 2008 New Revision: 43250 URL: http://svn.opensuse.org/viewcvs/yast?rev=43250&view=rev Log: endless loop in pre-script fixed (#351103) Modified: trunk/autoinstallation/package/autoyast2.changes trunk/autoinstallation/src/modules/AutoinstScripts.ycp Modified: trunk/autoinstallation/package/autoyast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/package/autoyast2.changes?rev=43250&r1=43249&r2=43250&view=diff ============================================================================== --- trunk/autoinstallation/package/autoyast2.changes (original) +++ trunk/autoinstallation/package/autoyast2.changes Wed Jan 2 13:27:25 2008 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Wed Jan 2 13:24:05 CET 2008 - ug@suse.de + +- endless loop in pre-script fixed (#351103) + +------------------------------------------------------------------- Fri Dec 7 11:47:42 CET 2007 - ug@suse.de - 2.16.3 Modified: trunk/autoinstallation/src/modules/AutoinstScripts.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/modules/AutoinstScripts.ycp?rev=43250&r1=43249&r2=43250&view=diff ============================================================================== --- trunk/autoinstallation/src/modules/AutoinstScripts.ycp (original) +++ trunk/autoinstallation/src/modules/AutoinstScripts.ycp Wed Jan 2 13:27:25 2008 @@ -559,21 +559,30 @@ { string debug = ( s["debug"]:true ? "-x" : "" ); executionString = sformat("/bin/sh %1 %2 2&> %3/%4.log ", debug, scriptPath, current_logdir, scriptName); - y2milestone("Script Execution command: %1", executionString ); - SCR::Execute (.target.bash, executionString); + if( SCR::Read (.target.size, scriptPath+"-run" ) == -1 || s["rerun"]:false == true ) { + y2milestone("Script Execution command: %1", executionString ); + SCR::Execute (.target.bash, executionString); + SCR::Execute (.target.bash, "/bin/touch $FILE", $["FILE":scriptPath+"-run"]); + } } else if (scriptInterpreter == "perl") { string debug = ( s["debug"]:true ? "-w" : "" ); executionString = sformat("/usr/bin/perl %1 %2 2&> %3/%4.log ", debug, scriptPath, current_logdir, scriptName); - y2milestone("Script Execution command: %1", executionString ); - SCR::Execute (.target.bash, executionString); + if( SCR::Read (.target.size, scriptPath+"-run" ) == -1 || s["rerun"]:false == true ) { + y2milestone("Script Execution command: %1", executionString ); + SCR::Execute (.target.bash, executionString); + SCR::Execute (.target.bash, "/bin/touch $FILE", $["FILE":scriptPath+"-run"]); + } } else if (scriptInterpreter == "python") { executionString = sformat("/usr/bin/python %1 2&> %2/%3.log ", scriptPath, current_logdir, scriptName ); - y2milestone("Script Execution command: %1", executionString ); - SCR::Execute (.target.bash, executionString); + if( SCR::Read (.target.size, scriptPath+"-run" ) == -1 || s["rerun"]:false == true ) { + y2milestone("Script Execution command: %1", executionString ); + SCR::Execute (.target.bash, executionString); + SCR::Execute (.target.bash, "/bin/touch $FILE", $["FILE":scriptPath+"-run"]); + } } else { -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org