[PATCH 1/8] Do not raise DeviceError if not bootable device is found.

[David Cantrell <dcantrell@xxxxxxxxxx>]

Continuation of 8fe8f5478e84adbe28cca63d72b9ea6552ae79e9 for the
other platforms listed in platform.py.
---
 platform.py |   17 +++--------------
 1 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/platform.py b/platform.py
index 2c35a5c..6db026e 100644
--- a/platform.py
+++ b/platform.py
@@ -126,12 +126,7 @@ class EFI(Platform):
 
     def bootDevice(self):
         mntDict = self._mntDict()
-        bootDev = mntDict.get("/boot/efi")
-
-        if not bootDev:
-            raise DeviceError("No bootable device found")
-        else:
-            return bootDev
+        return mntDict.get("/boot/efi")
 
     def bootloaderChoices(self, bl):
         bootDev = self.bootDevice()
@@ -234,10 +229,7 @@ class IPSeriesPPC(PPC):
                 bootDev = device
                 break
 
-        if not bootDev:
-            raise DeviceError("No bootable device found")
-        else:
-            return bootDev
+        return bootDev
 
     def bootloaderChoices(self, bl):
         ret = {}
@@ -283,10 +275,7 @@ class NewWorldPPC(PPC):
             if device.format.type == "hfs" and device.bootable:
                 bootDev = device
 
-        if not bootDev:
-            raise DeviceError("No bootable device found")
-        else:
-            return bootDev
+        return bootDev
 
     def bootloaderChoices(self, bl):
         ret = {}
-- 
1.6.1.3

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