Author: aschnell Date: Tue Aug 5 11:22:23 2008 New Revision: 49681 URL: http://svn.opensuse.org/viewcvs/yast?rev=49681&view=rev Log: - removed obsolete code (mostly evms related) Modified: trunk/storage/storage/src/include/custom_part_check_generated.ycp trunk/storage/storage/src/include/partition_defines.ycp trunk/storage/storage/src/modules/Storage.ycp Modified: trunk/storage/storage/src/include/custom_part_check_generated.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/custom_part_check_generated.ycp?rev=49681&r1=49680&r2=49681&view=diff ============================================================================== --- trunk/storage/storage/src/include/custom_part_check_generated.ycp (original) +++ trunk/storage/storage/src/include/custom_part_check_generated.ycp Tue Aug 5 11:22:23 2008 @@ -707,29 +707,6 @@ if (ret == true) retval = `again; } - if( !Storage::CheckEvmsLvm() ) - { - if( Popup::YesNo( evms_texts_evms_lvm() )) - { - Storage::DoCheckEvmsLvm = false; - } - else - { - retval = `again; - } - } - if( !Storage::CheckEvmsNonEvms() ) - { - if( Popup::YesNo( evms_texts_evms_nonevms() )) - { - Storage::DoCheckEvmsNonEvms = false; - } - else - { - retval = `again; - } - } - return( [targetMap, retval] ); }; Modified: trunk/storage/storage/src/include/partition_defines.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/partition_defines.ycp?rev=49681&r1=49680&r2=49681&view=diff ============================================================================== --- trunk/storage/storage/src/include/partition_defines.ycp (original) +++ trunk/storage/storage/src/include/partition_defines.ycp Tue Aug 5 11:22:23 2008 @@ -28,27 +28,10 @@ import "Report"; import "String"; import "Popup"; -// include "partitioning/custom_part_testdata.ycp"; - textdomain "storage"; - - ////////////////////////////////////////////////////////////////////// - // fills up a string to a minimum length - - define string ToLen( integer wide, string str ) - ``{ - while ( size(str) < wide ) str = " " + str; - return( str ); - }; - ////////////////////////////////////////////////////////////////////// - // converts int to string - // fills up the string to a minimum length + textdomain "storage"; - define string ToStringLen( integer wide, integer number ) - ``{ - return( ToLen( wide, sformat("%1", number ))); - }; ////////////////////////////////////////////////////////////////////// // size str to byte @@ -270,31 +253,5 @@ return( Mode::normal()?"":(free_list[0]:"") ); }; -define string evms_texts_evms_nonevms() - ``{ - string t = -_("It is normally not a good idea to use EVMS and non-EVMS -entities on the same disk. -While it is possible in principle and may make sense -for experienced users, it also can easily create -unexpected problems. - -Really do this? -"); - return( t ); - } -define string evms_texts_evms_lvm() - { - string t = -_("It is normally not a good idea to use EVMS and LVM -on the same system. -While it is possible in principle and may make sense -for experienced users, it also can easily create -unexpected problems. - -Really do this? -"); - return( t ); - } } Modified: trunk/storage/storage/src/modules/Storage.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Storage.ycp?rev=49681&r1=49680&r2=49681&view=diff ============================================================================== --- trunk/storage/storage/src/modules/Storage.ycp (original) +++ trunk/storage/storage/src/modules/Storage.ycp Tue Aug 5 11:22:23 2008 @@ -157,8 +157,6 @@ "right_asymmetric" : LibStorage::RIGHT_ASYMMETRIC(), "right_symmetric" : LibStorage::RIGHT_SYMMETRIC() ]; -global boolean DoCheckEvmsNonEvms = true; -global boolean DoCheckEvmsLvm = true; map DiskMapVersion = $[]; map DiskMap = $[]; map ClassifiedSettings = $[]; @@ -6187,35 +6185,6 @@ return( disks ); }; -global define boolean CheckEvmsNonEvms() - ``{ - boolean ret = true; - if( DoCheckEvmsNonEvms ) - { - map tg = GetTargetMap(); - list<string> evms = GetUsedEvmsDisks( tg ); - list<string> nonevms = GetUsedRealDisksNew( tg, true ); - evms = filter( string d, evms, ``(contains( nonevms, d ))); - y2milestone( "CheckEvmsNonEvms intersec %1", evms ); - ret = size(evms)==0; - } - y2milestone( "CheckEvmsNonEvms ret %1", ret ); - return( ret ); - }; - -global define boolean CheckEvmsLvm() - ``{ - boolean ret = true; - if( DoCheckEvmsLvm ) - { - map tg = GetTargetMap(); - list evms = GetUsedEvmsDisks( tg ); - list lvms = GetUsedLvmGroups( tg ); - ret = size(evms)==0 || size(lvms)==0; - } - y2milestone( "CheckEvmsLvm ret %1", ret ); - return( ret ); - }; global list<map> GetPrepBoot( map tg ) { -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org