Author: kmachalkova Date: Wed Nov 4 16:14:43 2009 New Revision: 59294 URL: http://svn.opensuse.org/viewcvs/yast?rev=59294&view=rev Log: More readable code Modified: branches/SuSE-Code-11-SP1-Branch/storage/storage/src/include/ep-hd-lib.ycp Modified: branches/SuSE-Code-11-SP1-Branch/storage/storage/src/include/ep-hd-lib.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/storage/storage/src/include/ep-hd-lib.ycp?rev=59294&r1=59293&r2=59294&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/storage/storage/src/include/ep-hd-lib.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/storage/storage/src/include/ep-hd-lib.ycp Wed Nov 4 16:14:43 2009 @@ -7,6 +7,7 @@ { textdomain "storage"; + import "Map"; void EpCreatePartitionTable(string disk_device) { @@ -356,17 +357,22 @@ list <string> AvailableTargetDisks() { list <string> items = []; - foreach(string dev, map props, target_map, { - if( dev != device && props["type"]:`CT_UNKNOWN == `CT_DISK - && props["size_k"]:0 >= mysize ) + map filtered_target_map = + filter( string dev, map props, target_map, { + return ( dev != device && + props["type"]:`CT_UNKNOWN == `CT_DISK && + props["used_by_device"]:"" == ""); + }); + + y2milestone("Available and unused disks (other than %1): %2", device, Map::Keys(filtered_target_map)); + + foreach( string dev, map props, filtered_target_map,{ + if( props["size_k"]:0 >= mysize ) items = add(items, dev); - else { - if( props["type"]:`CT_UNKNOWN != `CT_DISK) - y2milestone("%1 is not a disk , skipping it", device); - else - y2milestone("%1 is smaller than needed, skipping it", device); - } + else + y2milestone("%1 is smaller than needed, skipping it", device); }); + return items; } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org