Author: ug Date: Thu Mar 18 12:18:30 2010 New Revision: 61374 URL: http://svn.opensuse.org/viewcvs/yast?rev=61374&view=rev Log: script filenames fixed 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=61374&r1=61373&r2=61374&view=diff ============================================================================== --- trunk/autoinstallation/package/autoyast2.changes (original) +++ trunk/autoinstallation/package/autoyast2.changes Thu Mar 18 12:18:30 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Mar 18 12:17:36 CET 2010 - ug@suse.de + +- prefer the filename of a remote script instead of the + type of a script when no filename is specified in the XML + +------------------------------------------------------------------- Thu Mar 18 10:30:38 CET 2010 - ug@suse.de - translation of by-id, by-path, ... is done by libstorage now Modified: trunk/autoinstallation/src/modules/AutoinstScripts.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/modules/AutoinstScripts.ycp?rev=61374&r1=61373&r2=61374&view=diff ============================================================================== --- trunk/autoinstallation/src/modules/AutoinstScripts.ycp (original) +++ trunk/autoinstallation/src/modules/AutoinstScripts.ycp Thu Mar 18 12:18:30 2010 @@ -650,11 +650,13 @@ foreach( map s, scripts, ``{ string scriptInterpreter = s["interpreter"]:"shell"; - string scriptName = s["filename"]:type; + string scriptName = s["filename"]:""; if (scriptName=="") { map t = URL::Parse(s["location"]:""); scriptName=basename(t["path"]:""); + if( scriptName == "" ) + scriptName = type; } string scriptPath = ""; -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org