Author: aschnell Date: Fri Aug 8 22:11:19 2008 New Revision: 49895 URL: http://svn.opensuse.org/viewcvs/yast?rev=49895&view=rev Log: - fixed PredicateUsedByDevice Modified: trunk/storage/storage/src/include/ep-dm.ycp trunk/storage/storage/src/modules/StorageFields.ycp Modified: trunk/storage/storage/src/include/ep-dm.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-dm.ycp?rev=49895&r1=49894&r2=49895&view=diff ============================================================================== --- trunk/storage/storage/src/include/ep-dm.ycp (original) +++ trunk/storage/storage/src/include/ep-dm.ycp Fri Aug 8 22:11:19 2008 @@ -95,8 +95,7 @@ symbol Predicate(map disk, map partition) { - // TODO: this is sick - return StorageFields::PredicateUsedByDevice(disk, partition, [ "/dev/" + substring(part_device, 12) ]); + return StorageFields::PredicateUsedByDevice(disk, partition, [ part_device ]); } list<symbol> fields = StorageSettings::FilterTable([ `device, `udev_path, `udev_id, `size, Modified: trunk/storage/storage/src/modules/StorageFields.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/StorageFields.ycp?rev=49895&r1=49894&r2=49895&view=diff ============================================================================== --- trunk/storage/storage/src/modules/StorageFields.ycp (original) +++ trunk/storage/storage/src/modules/StorageFields.ycp Fri Aug 8 22:11:19 2008 @@ -754,16 +754,25 @@ */ global symbol PredicateUsedByDevice(map disk, map partition, list<string> devices) { + // TODO: this should come from libstorage + string UsedByDevice(map tmp) + { + if (tmp["used_by_type"]:`UB_NONE == `UB_DM) + return "/dev/mapper/" + tmp["used_by"]:""; + else + return "/dev/" + tmp["used_by"]:""; + } + if (partition == nil) { - if (contains(devices, "/dev/" + disk["used_by"]:"")) + if (contains(devices, UsedByDevice(disk))) return `showandfollow; else return `follow; } else { - if (contains(devices, "/dev/" + partition["used_by"]:"")) + if (contains(devices, UsedByDevice(partition))) return `show; else return `ignore; -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org