Author: aschnell Date: Wed May 20 15:23:59 2009 New Revision: 57270 URL: http://svn.opensuse.org/viewcvs/yast?rev=57270&view=rev Log: - removed usedByName from StorageInterface and "used_by" from target-map since superseded by usedByDevice and "used_by_device" Modified: trunk/storage/libstorage/src/Container.cc trunk/storage/libstorage/src/StorageInterface.h trunk/storage/libstorage/src/Volume.cc trunk/storage/package/yast2-storage.changes trunk/storage/storage/src/include/lvm_pv_lib.ycp trunk/storage/storage/src/modules/Storage.ycp trunk/storage/storage/src/modules/StorageProposal.ycp Modified: trunk/storage/libstorage/src/Container.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Container.... ============================================================================== --- trunk/storage/libstorage/src/Container.cc (original) +++ trunk/storage/libstorage/src/Container.cc Wed May 20 15:23:59 2009 @@ -287,7 +287,6 @@ info.name = name(); info.device = device(); info.usedByType = uby.type(); - info.usedByName = uby.name(); info.usedByDevice = uby.device(); info.readonly = readonly(); tinfo = info; Modified: trunk/storage/libstorage/src/StorageInterface.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/StorageInt... ============================================================================== --- trunk/storage/libstorage/src/StorageInterface.h (original) +++ trunk/storage/libstorage/src/StorageInterface.h Wed May 20 15:23:59 2009 @@ -192,7 +192,6 @@ string device; string name; UsedByType usedByType; - string usedByName; // deprecated string usedByDevice; bool readonly; }; @@ -274,7 +273,6 @@ string mount; MountByType mount_by; UsedByType usedByType; - string usedByName; // deprecated string usedByDevice; string fstab_options; string uuid; Modified: trunk/storage/libstorage/src/Volume.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Volume.cc?... ============================================================================== --- trunk/storage/libstorage/src/Volume.cc (original) +++ trunk/storage/libstorage/src/Volume.cc Wed May 20 15:23:59 2009 @@ -2710,7 +2710,6 @@ info.mount = mp; info.mount_by = mount_by; info.usedByType = uby.type(); - info.usedByName = uby.name(); info.usedByDevice = uby.device(); info.fstab_options = fstab_opt; info.uuid = uuid; Modified: trunk/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/package/yast2-storage.cha... ============================================================================== --- trunk/storage/package/yast2-storage.changes (original) +++ trunk/storage/package/yast2-storage.changes Wed May 20 15:23:59 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed May 20 15:17:21 CEST 2009 - aschnell@suse.de + +- removed usedByName from StorageInterface and "used_by" from + target-map since superseded by usedByDevice and "used_by_device" + +------------------------------------------------------------------- Wed May 20 12:52:16 CEST 2009 - aschnell@suse.de - require newer version of yast2 base package (bnc #504429) Modified: trunk/storage/storage/src/include/lvm_pv_lib.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/lvm_p... ============================================================================== --- trunk/storage/storage/src/include/lvm_pv_lib.ycp (original) +++ trunk/storage/storage/src/include/lvm_pv_lib.ycp Wed May 20 15:23:59 2009 @@ -116,7 +116,6 @@ { p["used_by_type"] = devmap["used_by_type"]:`UB_NONE; p["used_by_device"] = devmap["used_by_device"]:""; - p["used_by"] = devmap["used_by"]:""; } parts = [ p ]; } Modified: trunk/storage/storage/src/modules/Storage.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Stora... ============================================================================== --- trunk/storage/storage/src/modules/Storage.ycp (original) +++ trunk/storage/storage/src/modules/Storage.ycp Wed May 20 15:23:59 2009 @@ -1269,7 +1269,6 @@ if( t!=LibStorage::UB_NONE() ) { p["used_by_type"] = toSymbol( conv_usedby, t ); - p["used_by"] = LibStorage::VolumeInfo::swig_usedByName_get(vinfo); p["used_by_device"] = LibStorage::VolumeInfo::swig_usedByDevice_get(vinfo); } tmp = LibStorage::VolumeInfo::swig_fstab_options_get(vinfo); @@ -1601,7 +1600,7 @@ { list<string> l = [ "size_k", "cyl_size", "cyl_count", "label", "max_logical", "max_primary", "type", "readonly", - "used_by_type", "used_by", "used_by_device", "partitions", "dasdfmt", + "used_by_type", "used_by_device", "partitions", "dasdfmt", "udev_id", "udev_path" ]; foreach( string s, l, ``{ @@ -1629,7 +1628,6 @@ if( t!=LibStorage::UB_NONE() ) { c["used_by_type"] = toSymbol( conv_usedby, t ); - c["used_by"] = LibStorage::ContainerInfo::swig_usedByName_get(info); c["used_by_device"] = LibStorage::ContainerInfo::swig_usedByDevice_get(info); } boolean b = LibStorage::ContainerInfo::swig_readonly_get(info); Modified: trunk/storage/storage/src/modules/StorageProposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Stora... ============================================================================== --- trunk/storage/storage/src/modules/StorageProposal.ycp (original) +++ trunk/storage/storage/src/modules/StorageProposal.ycp Wed May 20 15:23:59 2009 @@ -3040,12 +3040,10 @@ }); y2milestone( "remove_vm removed:%1", tg[key]:$[] ); list<string> dl = tg[key,"devices"]:[]; - foreach( string d, dl, - ``{ - tg = Storage::DelPartitionData( tg, d, "used_by" ); + foreach( string d, dl, { tg = Storage::DelPartitionData( tg, d, "used_by_type" ); tg = Storage::DelPartitionData( tg, d, "used_by_device" ); - }); + }); } return( tg ); } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org