Author: juhliarik Date: Fri Apr 24 11:42:22 2009 New Revision: 56960 URL: http://svn.opensuse.org/viewcvs/yast?rev=56960&view=rev Log: fix using find Modified: trunk/bootloader/src/modules/Bootloader.ycp trunk/bootloader/src/routines/misc.ycp Modified: trunk/bootloader/src/modules/Bootloader.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/modules/Bootloader... ============================================================================== --- trunk/bootloader/src/modules/Bootloader.ycp (original) +++ trunk/bootloader/src/modules/Bootloader.ycp Fri Apr 24 11:42:22 2009 @@ -1411,7 +1411,7 @@ map out = (map)WFM::Execute(.local.bash_output, cmd); - if (find(out["stdout"]:"", "VirtualBox") != -1) + if (search(out["stdout"]:"", "VirtualBox") != nil) { y2milestone ("Installation run on VirtualBox, skip kexec loading: %1", out); return false; @@ -1428,7 +1428,7 @@ // find default section in BootCommon::sections foreach(map<string,any> section, BootCommon::sections, { - if ((find(tostring(section["name"]:""),name) != -1) + if ((search(tostring(section["name"]:""),name) != nil) && (section["root"]:nil == linux_default["root"]:nil) && (section["original_name"]:"" != "failsafe")) { Modified: trunk/bootloader/src/routines/misc.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/routines/misc.ycp?... ============================================================================== --- trunk/bootloader/src/routines/misc.ycp (original) +++ trunk/bootloader/src/routines/misc.ycp Fri Apr 24 11:42:22 2009 @@ -404,7 +404,7 @@ // examineMBR returns "* stage1" when it finds the signature // of some stage1 bootloader string result = examineMBR(device); - if ((search(result, "grub") != nil) || ((search(result, "lilo") != nil)) + if ((search(result, "grub") != nil) || (search(result, "lilo") != nil)) return true; else return false; -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org