Author: odabrunz Date: Tue Jul 10 22:14:20 2007 New Revision: 39301 URL: http://svn.opensuse.org/viewcvs/yast?rev=39301&view=rev Log: - fixed some whitespace - fixed myToInteger(): return 0 if string cannot be converted to integer - bootloader.rnc fixed for autoyast schema check (#211014) Modified: trunk/bootloader/src/config/bootloader.rnc trunk/bootloader/src/modules/BootGRUB.ycp trunk/bootloader/src/routines/misc.ycp Modified: trunk/bootloader/src/config/bootloader.rnc URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/config/bootloader.rnc?rev=39301&r1=39300&r2=39301&view=diff ============================================================================== --- trunk/bootloader/src/config/bootloader.rnc (original) +++ trunk/bootloader/src/config/bootloader.rnc Tue Jul 10 22:14:20 2007 @@ -42,6 +42,7 @@ bl_global = element global { element boot_custom { text }? & + element generic_mbr { text }? & lines_cache_id? & bl_timeout? & gfxmenu? & Modified: trunk/bootloader/src/modules/BootGRUB.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/modules/BootGRUB.ycp?rev=39301&r1=39300&r2=39301&view=diff ============================================================================== --- trunk/bootloader/src/modules/BootGRUB.ycp (original) +++ trunk/bootloader/src/modules/BootGRUB.ycp Tue Jul 10 22:14:20 2007 @@ -561,7 +561,7 @@ } } else { - BootCommon::globals["activate"] = + BootCommon::globals["activate"] = BootCommon::activate ? "true" : "false"; BootCommon::globals["generic_mbr"] = BootCommon::repl_mbr ? "true" : "false"; Modified: trunk/bootloader/src/routines/misc.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/routines/misc.ycp?rev=39301&r1=39300&r2=39301&view=diff ============================================================================== --- trunk/bootloader/src/routines/misc.ycp (original) +++ trunk/bootloader/src/routines/misc.ycp Tue Jul 10 22:14:20 2007 @@ -765,7 +765,8 @@ if (is (num_any, integer)) return (integer)num_any; if (is (num_any, string)) - return (num_any == "") ? 0 : tointeger((string)num_any); + return (num_any == "") ? 0 : + (tointeger((string)num_any) == nil ? 0 : tointeger((string)num_any)); return 0; } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org