Author: aschnell Date: Fri Aug 1 12:15:18 2008 New Revision: 49569 URL: http://svn.opensuse.org/viewcvs/yast?rev=49569&view=rev Log: - cleanup Modified: trunk/storage/storage/src/include/ep-lib.ycp trunk/storage/storage/src/inst_custom_part.ycp Modified: trunk/storage/storage/src/include/ep-lib.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-lib.ycp?rev=49569&r1=49568&r2=49569&view=diff ============================================================================== --- trunk/storage/storage/src/include/ep-lib.ycp (original) +++ trunk/storage/storage/src/include/ep-lib.ycp Fri Aug 1 12:15:18 2008 @@ -78,7 +78,7 @@ { if( Popup::YesNo( sformat(_("Really delete BIOS RAID %1?"), id ))) { - if( deleteAllDevPartitions( disk, Stage::initial(), bsd_label )) + if( deleteAllDevPartitions( disk, Stage::initial(), false )) Storage::DeleteDmraid( id ); return true; } @@ -86,7 +86,7 @@ // YesNo popup text %1 is replaced by a disk name e.g. /dev/hda else if( Popup::YesNo( sformat(_("Really delete all partitions on %1?"), id ))) { - deleteAllDevPartitions( disk, Stage::initial(), bsd_label ); + deleteAllDevPartitions( disk, Stage::initial(), false ); return true; } } @@ -121,7 +121,7 @@ return false; } if( part["type"]:`primary != `extended && - !check_device_delete( part, bsd_label, Stage::initial(), + !check_device_delete( part, false, Stage::initial(), disk )) { return false; Modified: trunk/storage/storage/src/inst_custom_part.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/inst_custom_part.ycp?rev=49569&r1=49568&r2=49569&view=diff ============================================================================== --- trunk/storage/storage/src/inst_custom_part.ycp (original) +++ trunk/storage/storage/src/inst_custom_part.ycp Fri Aug 1 12:15:18 2008 @@ -59,6 +59,7 @@ include "partitioning/custom_part_dialogs.ycp"; include "partitioning/custom_part_check_generated.ycp"; include "partitioning/evms_lib.ycp"; + include "partitioning/ep-main.ycp"; boolean show_disk = true; @@ -2120,7 +2121,6 @@ // MAIN: ///////////////////////////////////////////////////////////////// - include "partitioning/ep-main.ycp"; return test_new_ep(); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org