--- pyanaconda/ui/gui/spokes/lib/cart.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pyanaconda/ui/gui/spokes/lib/cart.py b/pyanaconda/ui/gui/spokes/lib/cart.py index bcb9cfa..2162412 100644 --- a/pyanaconda/ui/gui/spokes/lib/cart.py +++ b/pyanaconda/ui/gui/spokes/lib/cart.py @@ -81,7 +81,7 @@ class SelectedDisksDialog(GUIObject): row[IS_BOOT_COL] = True break
- def refresh(self, free, showRemove=True): + def refresh(self, disks, free, showRemove=True): super(SelectedDisksDialog, self).refresh()
self._view = self.builder.get_object("disk_view")
--- pyanaconda/ui/gui/spokes/storage.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pyanaconda/ui/gui/spokes/storage.py b/pyanaconda/ui/gui/spokes/storage.py index 40be69f..3498517 100644 --- a/pyanaconda/ui/gui/spokes/storage.py +++ b/pyanaconda/ui/gui/spokes/storage.py @@ -127,7 +127,7 @@ class InstallOptions1Dialog(GUIObject): RESPONSE_QUIT = 4
def __init__(self, *args, **kwargs): - self.payload = kwargs.pop("payload") + self.payload = kwargs.pop("payload", None) GUIObject.__init__(self, *args, **kwargs)
def run(self):
--- pyanaconda/ui/gui/spokes/lib/cart.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pyanaconda/ui/gui/spokes/lib/cart.py b/pyanaconda/ui/gui/spokes/lib/cart.py index 2162412..1b46bc2 100644 --- a/pyanaconda/ui/gui/spokes/lib/cart.py +++ b/pyanaconda/ui/gui/spokes/lib/cart.py @@ -159,7 +159,7 @@ class SelectedDisksDialog(GUIObject): if row[IS_BOOT_COL]: for disk in self.disks: if disk.id == row[ID_COL]: - self.data.bootloader.bootDrive = dev.name + self.data.bootloader.bootDrive = disk.name return
def on_selection_changed(self, *args):
--- pyanaconda/ui/gui/spokes/lib/resize.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pyanaconda/ui/gui/spokes/lib/resize.py b/pyanaconda/ui/gui/spokes/lib/resize.py index fcccbeb..17bd15e 100644 --- a/pyanaconda/ui/gui/spokes/lib/resize.py +++ b/pyanaconda/ui/gui/spokes/lib/resize.py @@ -124,7 +124,7 @@ class ResizeDialog(GUIObject): continue
# Devices that are not resizable are still deletable. - if dev.resizable: + if getattr(dev, "resizable", False): freeSize = dev.size - dev.minSize else: freeSize = dev.size
On Mon, 2012-10-08 at 11:11 -0400, Chris Lumens wrote:
pyanaconda/ui/gui/spokes/lib/resize.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pyanaconda/ui/gui/spokes/lib/resize.py b/pyanaconda/ui/gui/spokes/lib/resize.py index fcccbeb..17bd15e 100644 --- a/pyanaconda/ui/gui/spokes/lib/resize.py +++ b/pyanaconda/ui/gui/spokes/lib/resize.py @@ -124,7 +124,7 @@ class ResizeDialog(GUIObject): continue
# Devices that are not resizable are still deletable.
if dev.resizable:
if getattr(dev, "resizable", False): freeSize = dev.size - dev.minSize else: freeSize = dev.size
dev is None, which means the getDeviceByPath call didn't find a matching device. You probably want to check for that right after that call, log it, and continue.
Dave
dev is None, which means the getDeviceByPath call didn't find a matching device. You probably want to check for that right after that call, log it, and continue.
Oh, that was dumb of me.
Well anyway, doesn't dev being None seem like a larger problem?
- Chris
On Mon, 2012-10-08 at 11:57 -0400, Chris Lumens wrote:
dev is None, which means the getDeviceByPath call didn't find a matching device. You probably want to check for that right after that call, log it, and continue.
Oh, that was dumb of me.
Well anyway, doesn't dev being None seem like a larger problem?
Two things I noticed upon further examination:
1) If StorageSpoke._doExecute's call to doKickstartStorage fails, we reset storage. What we do not do is reinitialize the spoke in that event so that all the disk instances are in the new storage instance. I think this is what's happening here: the disk list being passed around the UI is obsolete. 2) The loop that iterates over disks in the resize dialog's populate method does not take into account the possibility that a disk is not partitioned.
Dave
Two things I noticed upon further examination:
- If StorageSpoke._doExecute's call to doKickstartStorage fails, we reset storage. What we do not do is reinitialize the spoke in that event so that all the disk instances are in the new storage instance. I think this is what's happening here: the disk list being passed around the UI is obsolete.
- The loop that iterates over disks in the resize dialog's populate method does not take into account the possibility that a disk is not partitioned.
Okay, scratch patch #4 from this set for now.
- Chris
anaconda-patches@lists.fedorahosted.org