Author: dfiser Date: Wed Oct 31 14:32:10 2007 New Revision: 41687 URL: http://svn.opensuse.org/viewcvs/yast?rev=41687&view=rev Log: Fixed problems caused by change of StorageDevices API. Modified: trunk/bootloader/src/grub/misc.ycp trunk/bootloader/src/modules/BootGRUB.ycp trunk/bootloader/src/routines/global_widgets.ycp trunk/bootloader/src/routines/helps.ycp trunk/bootloader/src/routines/lilolike.ycp trunk/bootloader/src/routines/misc.ycp Modified: trunk/bootloader/src/grub/misc.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/grub/misc.ycp?rev=41687&r1=41686&r2=41687&view=diff ============================================================================== --- trunk/bootloader/src/grub/misc.ycp (original) +++ trunk/bootloader/src/grub/misc.ycp Wed Oct 31 14:32:10 2007 @@ -44,7 +44,7 @@ if (BootCommon::globals["boot_custom"]:nil == nil) ret = false; else if (BootCommon::globals["boot_custom"]:nil == - StorageDevices::FloppyDevice) + StorageDevices::FloppyDevice()) ret = true; else if (contains (BootCommon::getFloppyDevices (), BootCommon::globals["boot_custom"]:nil)) @@ -508,8 +508,8 @@ ids[index] = true; } }); - if (StorageDevices::FloppyPresent) - BootCommon::device_mapping[StorageDevices::FloppyDevice] = "fd0"; + if (StorageDevices::FloppyPresent()) + BootCommon::device_mapping[StorageDevices::FloppyDevice()] = "fd0"; y2milestone ("Detected device mapping: %1", BootCommon::device_mapping); } Modified: trunk/bootloader/src/modules/BootGRUB.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/modules/BootGRUB.ycp?rev=41687&r1=41686&r2=41687&view=diff ============================================================================== --- trunk/bootloader/src/modules/BootGRUB.ycp (original) +++ trunk/bootloader/src/modules/BootGRUB.ycp Wed Oct 31 14:32:10 2007 @@ -567,7 +567,7 @@ "__devs" : [], ]); } - else if (StorageDevices::FloppyPresent) + else if (StorageDevices::FloppyPresent()) { out = add (out, $[ "name" : BootCommon::translateSectionTitle("floppy"), Modified: trunk/bootloader/src/routines/global_widgets.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/routines/global_widgets.ycp?rev=41687&r1=41686&r2=41687&view=diff ============================================================================== --- trunk/bootloader/src/routines/global_widgets.ycp (original) +++ trunk/bootloader/src/routines/global_widgets.ycp Wed Oct 31 14:32:10 2007 @@ -519,13 +519,13 @@ ))); }; - if (StorageDevices::FloppyPresent) + if (StorageDevices::FloppyPresent()) { targetlist = add (targetlist, `VSpacing (1)); targetlist = add (targetlist, `Left (`RadioButton (`id ("floppy"), `opt (`notify), // radiobutton, %1 is device name, typically /dev/fd0 - sformat (_("&Floppy Disk %1"), StorageDevices::FloppyDevice), + sformat (_("&Floppy Disk %1"), StorageDevices::FloppyDevice()), (BootCommon::selected_location == "floppy") ))); } Modified: trunk/bootloader/src/routines/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/routines/helps.ycp?rev=41687&r1=41686&r2=41687&view=diff ============================================================================== --- trunk/bootloader/src/routines/helps.ycp (original) +++ trunk/bootloader/src/routines/helps.ycp Wed Oct 31 14:32:10 2007 @@ -126,7 +126,7 @@ if it is needed or configure your other boot manager to start &product;.</p>"); - if (StorageDevices::FloppyPresent) + if (StorageDevices::FloppyPresent()) { // custom bootloader help text, 4 of 7 // this part will only be shown if a floppy drive is attached. Modified: trunk/bootloader/src/routines/lilolike.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/routines/lilolike.ycp?rev=41687&r1=41686&r2=41687&view=diff ============================================================================== --- trunk/bootloader/src/routines/lilolike.ycp (original) +++ trunk/bootloader/src/routines/lilolike.ycp Wed Oct 31 14:32:10 2007 @@ -1242,8 +1242,8 @@ ids[index] = true; } }); - if (StorageDevices::FloppyPresent) - device_mapping[StorageDevices::FloppyDevice] = "fd0"; + if (StorageDevices::FloppyPresent()) + device_mapping[StorageDevices::FloppyDevice()] = "fd0"; y2milestone ("Detected device mapping: %1", device_mapping); } Modified: trunk/bootloader/src/routines/misc.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/routines/misc.ycp?rev=41687&r1=41686&r2=41687&view=diff ============================================================================== --- trunk/bootloader/src/routines/misc.ycp (original) +++ trunk/bootloader/src/routines/misc.ycp Wed Oct 31 14:32:10 2007 @@ -606,7 +606,7 @@ if (BootCommon::selected_location == "root") return BootCommon::RootPartitionDevice; if (BootCommon::selected_location == "floppy") - return StorageDevices::FloppyDevice; + return StorageDevices::FloppyDevice(); if (BootCommon::selected_location == "mbr_md") return "mbr_md"; if (BootCommon::selected_location == "none") @@ -678,7 +678,7 @@ // FIXME: floppy support is probably obsolete if ( haskey(BootCommon::globals, "boot_floppy") && BootCommon::globals["boot_floppy"]:"false" == "true" ) { - ret = add(ret, StorageDevices::FloppyDevice); + ret = add(ret, StorageDevices::FloppyDevice()); } if ( haskey(BootCommon::globals, "boot_custom") ) { ret = add(ret, BootCommon::globals["boot_custom"]:""); @@ -716,7 +716,7 @@ boolean ret = false; if (loader_device == nil) ret = false; - else if (loader_device == StorageDevices::FloppyDevice) + else if (loader_device == StorageDevices::FloppyDevice()) ret = true; else if (contains (getFloppyDevices (), loader_device)) ret = true; -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org