Author: aschnell Date: Tue Mar 3 13:53:53 2009 New Revision: 55881 URL: http://svn.opensuse.org/viewcvs/yast?rev=55881&view=rev Log: - use device instead of mountpoint in mountpoint node ids (otherwise uniqueness is lost for several swap devices), code is even simpler Modified: trunk/storage/libstorage/src/Graph.cc trunk/storage/storage/src/include/ep-graph.ycp Modified: trunk/storage/libstorage/src/Graph.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Graph.cc?rev=55881&r1=55880&r2=55881&view=diff ============================================================================== --- trunk/storage/libstorage/src/Graph.cc (original) +++ trunk/storage/libstorage/src/Graph.cc Tue Mar 3 13:53:53 2009 @@ -194,7 +194,7 @@ if (!i2->v.mount.empty()) { - Node mountpoint_node(NODE_MOUNTPOINT, "mountpoint:" + i2->v.mount, i2->v.mount, i2->v.sizeK); + 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)); @@ -222,7 +222,7 @@ if (!i2->v.mount.empty()) { - Node mountpoint_node(NODE_MOUNTPOINT, "mountpoint:" + i2->v.mount, i2->v.mount, i2->v.sizeK); + 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, lv_node.id, mountpoint_node.id)); @@ -248,7 +248,7 @@ if (!i2->v.mount.empty()) { - Node mountpoint_node(NODE_MOUNTPOINT, "mountpoint:" + i2->v.mount, i2->v.mount, i2->v.sizeK); + 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, md_node.id, mountpoint_node.id)); @@ -274,7 +274,7 @@ if (!i2->v.mount.empty()) { - Node mountpoint_node(NODE_MOUNTPOINT, "mountpoint:" + i2->v.mount, i2->v.mount, i2->v.sizeK); + 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, dm_node.id, mountpoint_node.id)); @@ -315,7 +315,7 @@ if (!i2->p.v.mount.empty()) { - Node mountpoint_node(NODE_MOUNTPOINT, "mountpoint:" + i2->p.v.mount, i2->p.v.mount, i2->p.v.sizeK); + Node mountpoint_node(NODE_MOUNTPOINT, "mountpoint:" + i2->p.v.device, i2->p.v.mount, i2->p.v.sizeK); nodes.push_back(mountpoint_node); edges.push_back(Edge(EDGE_MOUNT, partition_node.id, mountpoint_node.id)); @@ -356,7 +356,7 @@ if (!i2->p.v.mount.empty()) { - Node mountpoint_node(NODE_MOUNTPOINT, "mountpoint:" + i2->p.v.mount, i2->p.v.mount, i2->p.v.sizeK); + Node mountpoint_node(NODE_MOUNTPOINT, "mountpoint:" + i2->p.v.device, i2->p.v.mount, i2->p.v.sizeK); nodes.push_back(mountpoint_node); edges.push_back(Edge(EDGE_MOUNT, partition_node.id, mountpoint_node.id)); Modified: trunk/storage/storage/src/include/ep-graph.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-graph.ycp?rev=55881&r1=55880&r2=55881&view=diff ============================================================================== --- trunk/storage/storage/src/include/ep-graph.ycp (original) +++ trunk/storage/storage/src/include/ep-graph.ycp Tue Mar 3 13:53:53 2009 @@ -43,16 +43,6 @@ UI::SetFocus(UI::WidgetExists(`id(`table)) ? `id(`table) : `id(`text)); } - void GotoMountpoint(string mountpoint) - { - foreach(string dev, map disk, Storage::GetTargetMap(), { - foreach(map part, disk["partitions"]:[], { - if (part["mount"]:"" == mountpoint) - GotoDevice(part["device"]:""); - }); - }); - } - switch (widget) { case `graph: @@ -62,7 +52,7 @@ if (String::StartsWith(node, "device:")) GotoDevice(substring(node, 7)); else if (String::StartsWith(node, "mountpoint:")) - GotoMountpoint(substring(node, 11)); + GotoDevice(substring(node, 11)); } break; -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org