[PATCH 1/2] Don't crash if is_valid_foo methods are called with None.

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Related: rhbz#701228
---
 pyanaconda/bootloader.py |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/pyanaconda/bootloader.py b/pyanaconda/bootloader.py
index 1f7c2fd..7fc5f61 100644
--- a/pyanaconda/bootloader.py
+++ b/pyanaconda/bootloader.py
@@ -577,6 +577,10 @@ class BootLoader(object):
         self.errors = []
         self.warnings = []
         valid = True
+
+        if device is None:
+            return False
+
         try:
             description = self.device_description(device)
         except Exception:
@@ -686,6 +690,9 @@ class BootLoader(object):
         self.warnings = []
         valid = True
 
+        if device is None:
+            return False
+
         if not self._device_type_match(device, self.stage2_device_types):
             self.errors.append(_("The %s cannot be of type %s")
                                % (self.stage2_description, device.type))
@@ -1482,6 +1489,10 @@ class GRUB2(GRUB):
     #
     def _gpt_disk_has_bios_boot(self, device):
         ret = False
+
+        if device is None:
+            return ret
+
         # check that a bios boot partition is present if the stage1 device
         # is a gpt-labeled disk
         if device.isDisk and getattr(device.format, "labelType", None) == "gpt":
-- 
1.7.3.4

_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list


[Index of Archives]     [Kickstart]     [Fedora Users]     [Fedora Legacy List]     [Fedora Maintainers]     [Fedora Desktop]     [Fedora SELinux]     [Big List of Linux Books]     [Yosemite News]     [Yosemite Photos]     [KDE Users]     [Fedora Tools]
  Powered by Linux