[PATCH 1/2] Explicitly set True/False in the bootloader setting (#885381).

[Chris Lumens]

---
 pyanaconda/ui/gui/spokes/lib/cart.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pyanaconda/ui/gui/spokes/lib/cart.py b/pyanaconda/ui/gui/spokes/lib/cart.py
index 996c577..f3d2a26 100644
--- a/pyanaconda/ui/gui/spokes/lib/cart.py
+++ b/pyanaconda/ui/gui/spokes/lib/cart.py
@@ -210,11 +210,11 @@ class SelectedDisksDialog(GUIObject):
             # previously selected device.
             for row in self._store:
                 if row[ID_COL] == self._previousID:
-                    row[IS_BOOT_COL] = not row[IS_BOOT_COL]
+                    row[IS_BOOT_COL] = False
                     break

# Then we select the new row.
-            self._store[itr][IS_BOOT_COL] = not self._store[itr][IS_BOOT_COL]
+            self._store[itr][IS_BOOT_COL] = True
             self._previousID = self._store[itr][ID_COL]

self._toggle_button_text(self._store[itr])

[PATCH 2/2] It's possible for mountpoint to be None (#885279).

[Chris Lumens]

---
 pyanaconda/ui/gui/spokes/custom.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyanaconda/ui/gui/spokes/custom.py b/pyanaconda/ui/gui/spokes/custom.py
index 9318481..048b0dc 100644
--- a/pyanaconda/ui/gui/spokes/custom.py
+++ b/pyanaconda/ui/gui/spokes/custom.py
@@ -1770,7 +1770,7 @@ class CustomPartitioningSpoke(NormalSpoke, StorageChecker):
                                      AUTOPART_TYPE_BTRFS: DEVICE_TYPE_BTRFS}
         device_type = device_type_from_autopart[self.data.autopart.type]
         if (device_type != DEVICE_TYPE_PARTITION and
-            (mountpoint.startswith("/boot") or
+            ((mountpoint and mountpoint.startswith("/boot")) or
              fstype in partition_only_format_types)):
             device_type = DEVICE_TYPE_PARTITION

[David Lehman]

On Mon, 2012-12-10 at 15:26 -0500, Chris Lumens wrote:

These both look good.
> pyanaconda/ui/gui/spokes/lib/cart.py | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/pyanaconda/ui/gui/spokes/lib/cart.py b/pyanaconda/ui/gui/spokes/lib/cart.py
> index 996c577..f3d2a26 100644
> --- a/pyanaconda/ui/gui/spokes/lib/cart.py
> +++ b/pyanaconda/ui/gui/spokes/lib/cart.py
> @@ -210,11 +210,11 @@ class SelectedDisksDialog(GUIObject):
>              # previously selected device.
>              for row in self._store:
>                  if row[ID_COL] == self._previousID:
>                row[IS_BOOT_COL] = not row[IS_BOOT_COL]
>                row[IS_BOOT_COL] = False
>                break
>
>        # Then we select the new row.
>        self._store[itr][IS_BOOT_COL] = not self._store[itr][IS_BOOT_COL]
>        self._store[itr][IS_BOOT_COL] = True
>        self._previousID = self._store[itr][ID_COL]
>
>    self._toggle_button_text(self._store[itr])