diff options
| -rw-r--r-- | booty/bootloaderInfo.py | 2 | ||||
| -rw-r--r-- | kickstart.py | 2 | ||||
| -rw-r--r-- | partedUtils.py | 2 | ||||
| -rw-r--r-- | storage/__init__.py | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/booty/bootloaderInfo.py b/booty/bootloaderInfo.py index d1147348c..0c1ec5b5b 100644 --- a/booty/bootloaderInfo.py +++ b/booty/bootloaderInfo.py @@ -453,7 +453,7 @@ class bootloaderInfo: f.write("\n") def updateDriveList(self, sortedList=[]): - self._drivelist = map(lambda x: x.name, filter(lambda dev: dev.mediaPresent, self.storage.disks)) + self._drivelist = map(lambda x: x.name, self.storage.disks) self._drivelist.sort(isys.compareDrives) # If we're given a sort order, make sure the drives listed in it diff --git a/kickstart.py b/kickstart.py index 06f6199de..dfabd79b9 100644 --- a/kickstart.py +++ b/kickstart.py @@ -238,7 +238,7 @@ class ClearPart(commands.clearpart.FC3_ClearPart): if self.type is None: self.type = CLEARPART_TYPE_NONE - hds = map(lambda x: x.name, filter(lambda dev: dev.mediaPresent, self.handler.id.storage.disks)) + hds = map(lambda x: x.name, self.handler.id.storage.disks) for disk in self.drives: if disk not in hds: raise KickstartValueError, formatErrorMsg(self.lineno, msg="Specified nonexistent disk %s in clearpart command" % disk) diff --git a/partedUtils.py b/partedUtils.py index d3049eb7e..d0077f2b0 100644 --- a/partedUtils.py +++ b/partedUtils.py @@ -641,7 +641,7 @@ class DiskSet: def driveList (self): """Return the list of drives on the system.""" - drives = map(lambda x: x.name, filter(lambda x: isys.mediaPresent(x.name), self.anaconda.id.storage.disks)) + drives = map(lambda x: x.name, self.anaconda.id.storage.disks) drives.sort (isys.compareDrives) return drives diff --git a/storage/__init__.py b/storage/__init__.py index 84ce93e88..08ba90aed 100644 --- a/storage/__init__.py +++ b/storage/__init__.py @@ -614,7 +614,7 @@ class Storage(object): def extendedPartitionsSupported(self): """ Return whether any disks support extended partitions.""" - for disk in filter(lambda disk: disk.mediaPresent, self.disks): + for disk in self.disks: if disk.partedDisk.supportsFeature(parted.DISK_TYPE_EXTENDED): return True return False |