Author: aschnell Date: Thu Apr 8 17:01:32 2010 New Revision: 61624 URL: http://svn.opensuse.org/viewcvs/yast?rev=61624&view=rev Log: - adapted to StorageInterface change Modified: trunk/storage/storage/src/modules/Storage.ycp Modified: trunk/storage/storage/src/modules/Storage.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Storage.ycp?rev=61624&r1=61623&r2=61624&view=diff ============================================================================== --- trunk/storage/storage/src/modules/Storage.ycp (original) +++ trunk/storage/storage/src/modules/Storage.ycp Thu Apr 8 17:01:32 2010 @@ -1191,16 +1191,6 @@ d["dasdfmt"] = true; else if( haskey( d, "dasdfmt" )) d = remove( d, "dasdfmt" ); - string tmp = LibStorage::DiskInfo::swig_udevId_get(dinfo); - if( size(tmp)>0 ) - d["udev_id"] = splitstring( tmp, " " ); - else if( haskey( d, "udev_id" )) - d = remove( d, "udev_id" ); - tmp = LibStorage::DiskInfo::swig_udevPath_get(dinfo); - if( size(tmp)>0 ) - d["udev_path"] = tmp; - else if( haskey( d, "udev_path" )) - d = remove( d, "udev_path" ); y2milestone( "diskMap ret:%1", d ); return( d ); } @@ -1309,6 +1299,14 @@ tmp = LibStorage::VolumeInfo::swig_loop_get(vinfo); if( size(tmp)>0 ) p["loop"] = tmp; + + tmp = LibStorage::VolumeInfo::swig_udevPath_get(vinfo); + if (!isempty(tmp)) + p["udev_path"] = tmp; + tmp = LibStorage::VolumeInfo::swig_udevId_get(vinfo); + if (!isempty(tmp)) + p["udev_id"] = splitstring(tmp, " "); + return( p ); } @@ -1324,12 +1322,6 @@ boolean boot = LibStorage::PartitionAddInfo::swig_boot_get(info); if( boot ) p["boot"] = true; - string tmp = LibStorage::PartitionAddInfo::swig_udevId_get(info); - if( size(tmp)>0 ) - p["udev_id"] = splitstring( tmp, " " ); - tmp = LibStorage::PartitionAddInfo::swig_udevPath_get(info); - if( size(tmp)>0 ) - p["udev_path"] = tmp; y2milestone( "partAddMap ret:%1", p ); return( p ); } @@ -1400,12 +1392,6 @@ boolean boot = LibStorage::PartitionInfo::swig_boot_get(info); if( boot ) p["boot"] = true; - tmp = LibStorage::PartitionInfo::swig_udevId_get(info); - if( size(tmp)>0 ) - p["udev_id"] = splitstring( tmp, " " ); - tmp = LibStorage::PartitionInfo::swig_udevPath_get(info); - if( size(tmp)>0 ) - p["udev_path"] = tmp; c["partitions"] = add( c["partitions"]:[], p ); }); } @@ -1680,6 +1666,14 @@ boolean b = LibStorage::ContainerInfo::swig_readonly_get(info); if( b ) c["readonly"] = true; + + string tmp = LibStorage::ContainerInfo::swig_udevPath_get(info); + if (!isempty(tmp)) + c["udev_path"] = tmp; + tmp = LibStorage::ContainerInfo::swig_udevId_get(info); + if (!isempty(tmp)) + c["udev_id"] = splitstring(tmp, " "); + ret = add( ret, c ); }); y2milestone( "getContainers ret:%1", ret ); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org