Author: fehr Date: Wed Jan 25 12:23:01 2012 New Revision: 67284 URL: http://svn.opensuse.org/viewcvs/yast?rev=67284&view=rev Log: fix bug handling used devices of simple btrfs volumes in resize Modified: branches/SuSE-Code-11-SP2-Branch/storage/package/yast2-storage.changes branches/SuSE-Code-11-SP2-Branch/storage/storage/src/include/ep-btrfs-dialogs.ycp Modified: branches/SuSE-Code-11-SP2-Branch/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/storag... ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/package/yast2-storage.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/package/yast2-storage.changes Wed Jan 25 12:23:01 2012 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Wed Jan 25 12:20:53 CET 2012 - fehr@suse.de + +- fix bug handling used devices of simple btrfs volumes in resize + +------------------------------------------------------------------- Tue Jan 24 17:55:44 CET 2012 - fehr@suse.de - fix bug introduced with second to last commit Modified: branches/SuSE-Code-11-SP2-Branch/storage/storage/src/include/ep-btrfs-dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/storag... ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/storage/src/include/ep-btrfs-dialogs.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/storage/src/include/ep-btrfs-dialogs.ycp Wed Jan 25 12:23:01 2012 @@ -69,7 +69,7 @@ y2milestone( "GetPossibleVols parts:%1", devmap["partitions"]:[] ); list<map> parts = filter( map part, devmap["partitions"]:[], - ``( size(part["mount"]:"")==0 && + ``( (size(part["mount"]:"")==0 || part["used_by_type"]:`UB_NONE==`UB_BTRFS) && !contains( types_no, part["type"]:`primary ) && contains(allowed_enc_types, part["enc_type"]:`none) && (!Storage::IsUsedBy(part) || part["used_by_type"]:`UB_NONE==`UB_BTRFS) && @@ -136,9 +136,10 @@ list<symbol> fields = StorageSettings::FilterTable([ `device, `udev_path, `udev_id, `size, `encrypted, `type ]); - map<string, map> target_map = Storage::GetTargetMap(); - list<map> unused_pvs = filter(map pv, GetPossibleVols(target_map), { return !Storage::IsUsedBy(pv); }); - list<map> used_pvs = filter(map pv, GetPossibleVols(target_map), { return pv["used_by_device"]:"" == data["uuid"]:""; }); + list<map> poss_pvs = GetPossibleVols(Storage::GetTargetMap()); + y2milestone( "MiniWorkflowStepResizeVolume poss:%1", maplist( map pv, poss_pvs, ``( [ pv["device"]:"", pv["used_by_device"]:"" ]))); + list<map> unused_pvs = filter(map pv, poss_pvs, ``(pv["used_by_type"]:`UB_NONE==`UB_NONE)); + list<map> used_pvs = filter(map pv, poss_pvs, ``(pv["used_by_device"]:""==data["uuid"]:"")); term contents = `VBox(); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org