Author: ug Date: Wed Jan 9 11:56:49 2008 New Revision: 43486 URL: http://svn.opensuse.org/viewcvs/yast?rev=43486&view=rev Log: Buildrequires fixed, 2.16.4 Modified: trunk/autoinstallation/VERSION trunk/autoinstallation/autoyast2.spec.in trunk/autoinstallation/package/autoyast2.changes trunk/autoinstallation/src/modules/AutoinstScripts.ycp Modified: trunk/autoinstallation/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/VERSION?rev=43486&r1=43485&r2=43486&view=diff ============================================================================== --- trunk/autoinstallation/VERSION (original) +++ trunk/autoinstallation/VERSION Wed Jan 9 11:56:49 2008 @@ -1 +1 @@ -2.16.3 +2.16.4 Modified: trunk/autoinstallation/autoyast2.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/autoyast2.spec.in?rev=43486&r1=43485&r2=43486&view=diff ============================================================================== --- trunk/autoinstallation/autoyast2.spec.in (original) +++ trunk/autoinstallation/autoyast2.spec.in Wed Jan 9 11:56:49 2008 @@ -1,7 +1,7 @@ @HEADER-COMMENT@ @HEADER@ -BuildRequires: java2-devel-packages yast2-mouse yast2-transfer yast2-update yast2-bootloader xorg-x11-libs yast2-devtools pkg-config libxslt perl-XML-Writer docbook-xsl-stylesheets sgml-skel yast2-testsuite update-desktop-files +BuildRequires: java2-devel-packages yast2-mouse yast2-transfer yast2-update yast2-bootloader xorg-x11-libs yast2-devtools pkg-config libxslt perl-XML-Writer docbook-xsl-stylesheets sgml-skel yast2-testsuite update-desktop-files yast2-country BuildRequires: yast2 >= 2.16.8 Requires: yast2-core yast2-xml libxslt yast2-installation Modified: trunk/autoinstallation/package/autoyast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/package/autoyast2.changes?rev=43486&r1=43485&r2=43486&view=diff ============================================================================== --- trunk/autoinstallation/package/autoyast2.changes (original) +++ trunk/autoinstallation/package/autoyast2.changes Wed Jan 9 11:56:49 2008 @@ -2,6 +2,8 @@ Tue Jan 8 13:50:59 CET 2008 - ug@suse.de - experimental interactive scripts code added +- Buildrequires fixed +- 2.16.4 ------------------------------------------------------------------- Wed Jan 2 13:24:05 CET 2008 - ug@suse.de Modified: trunk/autoinstallation/src/modules/AutoinstScripts.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/modules/AutoinstScripts.ycp?rev=43486&r1=43485&r2=43486&view=diff ============================================================================== --- trunk/autoinstallation/src/modules/AutoinstScripts.ycp (original) +++ trunk/autoinstallation/src/modules/AutoinstScripts.ycp Wed Jan 9 11:56:49 2008 @@ -693,19 +693,27 @@ { string debug = ( s["debug"]:true ? "-w" : "" ); if( SCR::Read (.target.size, scriptPath+"-run" ) == -1 || s["rerun"]:false == true ) { - 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); - SCR::Execute (.target.bash, "/bin/touch $FILE", $["FILE":scriptPath+"-run"]); + if( s["interactive"]:false == true ) { + interactiveScript( "/usr/bin/perl", debug, scriptPath, current_logdir, scriptName ); + } else { + 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); + SCR::Execute (.target.bash, "/bin/touch $FILE", $["FILE":scriptPath+"-run"]); + } } } else if (scriptInterpreter == "python") { if( SCR::Read (.target.size, scriptPath+"-run" ) == -1 || s["rerun"]:false == true ) { - 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); - SCR::Execute (.target.bash, "/bin/touch $FILE", $["FILE":scriptPath+"-run"]); + if( s["interactive"]:false == true ) { + interactiveScript( "/usr/bin/python", "", scriptPath, current_logdir, scriptName ); + } else { + 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); + 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