Author: aschnell Date: Thu Mar 26 17:10:39 2009 New Revision: 56433 URL: http://svn.opensuse.org/viewcvs/yast?rev=56433&view=rev Log: - don't show partitions of disks used by something Modified: trunk/storage/libstorage/src/Graph.cc Modified: trunk/storage/libstorage/src/Graph.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Graph.cc?rev=56433&r1=56432&r2=56433&view=diff ============================================================================== --- trunk/storage/libstorage/src/Graph.cc (original) +++ trunk/storage/libstorage/src/Graph.cc Thu Mar 26 17:10:39 2009 @@ -174,30 +174,32 @@ { edges.push_back(Edge(EDGE_USED, disk_node.id, "device:" + i1->usedByDevice)); } - - deque<PartitionInfo> partitions; - s->getPartitionInfo(i1->name, partitions); - for (deque<PartitionInfo>::iterator i2 = partitions.begin(); i2 != partitions.end(); ++i2) + else { - if (i2->partitionType == EXTENDED) - continue; + deque<PartitionInfo> partitions; + s->getPartitionInfo(i1->name, partitions); + for (deque<PartitionInfo>::iterator i2 = partitions.begin(); i2 != partitions.end(); ++i2) + { + if (i2->partitionType == EXTENDED) + continue; - Node partition_node(NODE_PARTITION, "device:" + i2->v.device, i2->v.device, i2->v.sizeK); - nodes.push_back(partition_node); + Node partition_node(NODE_PARTITION, "device:" + i2->v.device, i2->v.device, i2->v.sizeK); + nodes.push_back(partition_node); - edges.push_back(Edge(EDGE_SUBDEVICE, disk_node.id, partition_node.id)); + edges.push_back(Edge(EDGE_SUBDEVICE, disk_node.id, partition_node.id)); - if (!i2->v.usedByDevice.empty()) - { - edges.push_back(Edge(EDGE_USED, partition_node.id, "device:" + i2->v.usedByDevice)); - } + if (!i2->v.usedByDevice.empty()) + { + edges.push_back(Edge(EDGE_USED, partition_node.id, "device:" + i2->v.usedByDevice)); + } - if (!i2->v.mount.empty()) - { - Node mountpoint_node(NODE_MOUNTPOINT, "mountpoint:" + i2->v.device, i2->v.mount, i2->v.sizeK); - nodes.push_back(mountpoint_node); + if (!i2->v.mount.empty()) + { + Node mountpoint_node(NODE_MOUNTPOINT, "mountpoint:" + i2->v.device, i2->v.mount, i2->v.sizeK); + nodes.push_back(mountpoint_node); - edges.push_back(Edge(EDGE_MOUNT, partition_node.id, mountpoint_node.id)); + edges.push_back(Edge(EDGE_MOUNT, partition_node.id, mountpoint_node.id)); + } } } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org