Attachment 217611 Details for Bug 305271 – fix iterating over partitions

[patch] fix iterating over partitions

305271.patch (text/plain), 2.42 KB, created by Chris Lumens on 2007-10-05 15:05:38 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Lumens

Created: 2007-10-05 15:05:38 UTC

Size: 2.42 KB

patch

obsolete

>--- partWindow.py	2006-06-05 10:33:09.000000000 -0400
>+++ ../../head/src/partWindow.py	2007-08-27 16:45:34.000000000 -0400
>@@ -227,20 +229,46 @@
> 
>     def on_edit_ok_button_clicked(self, *args):
>         part_object = self.part_store.get_value(self.current_iter, 5)
>-        result = self.formToKsdata(part_object)
>+        result = self.formToKickstart(part_object)
> 
>         if result is None:
>             return
> 
>         parent_iter = self.part_store.iter_parent(self.current_iter)
> 
>-        if part_object.device == None:
>-            self.part_store.set_value(self.current_iter, 0, "")
>+        if not part_object.device:
>+            # Move the partition object to under the Auto tree.
>+            if self.part_store.iter_n_children(parent_iter) == 1:
>+                # If this was previously in a hard drive drop down, we need
>+                # to remove the now-invalid iter as well.
>+                oldDevice = self.part_store.get_value(parent_iter, 0)
>+                try:
>+                    self.device_iter_dict.pop(oldDevice)
>+                except KeyError:
>+                    pass
>+
>+                # If the current iter is the only child, delete the parent and
>+                # the child
>+                self.part_store.remove(self.current_iter)
>+                self.part_store.remove(parent_iter)
>+            else:
>+                # If there are other children, just delete this child
>+                self.part_store.remove(self.current_iter)
>+
>+            self.current_iter = self.addPartitionToTree(part_object, self.current_iter)
>         else:
>             if self.part_store.get_value(parent_iter, 0) != part_object.device:
>-
>                 if self.part_store.iter_n_children(parent_iter) == 1:
>-                    #If the current iter is the only child, delete the parent and the child
>+                    # If this was previously in a hard drive drop down, we need
>+                    # to remove the now-invalid iter as well.
>+                    oldDevice = self.part_store.get_value(parent_iter, 0)
>+                    try:
>+                        self.device_iter_dict.pop(oldDevice)
>+                    except KeyError:
>+                        pass
>+
>+                    # If the current iter is the only child, delete the parent
>+                    # and the child
>                     self.part_store.remove(self.current_iter)
>                     self.part_store.remove(parent_iter)
>                 else:

Actions: View | Diff

Attachments on bug 305271: 217611