On Wed, 2014-11-05 at 09:49 -0600, David Lehman wrote:
---
blivet/devicetree.py | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/blivet/devicetree.py b/blivet/devicetree.py
index 3f24ed9..7af4c8e 100644
--- a/blivet/devicetree.py
+++ b/blivet/devicetree.py
@@ -946,7 +946,8 @@ class DeviceTree(object):
# - devices that contain disklabels made by isohybrid
#
if (disk.partitionable and not
- (disk.format.type == "iso9660" or disk.format.hidden)):
+ (disk.format.type == "iso9660" or disk.format.hidden) and
+ (flags.installer_mode and not self._isIgnoredDisk(disk))):
raise DeviceTreeError("failed to scan disk %s" % disk.name)
# there's no need to filter partitions on members of multipaths or
@@ -2184,15 +2185,15 @@ class DeviceTree(object):
if flags.installer_mode:
self.teardownAll()
- def _hideIgnoredDisks(self):
- def _is_ignored(disk):
- return ((self.ignoredDisks and disk.name in self.ignoredDisks) or
- (self.exclusiveDisks and
- disk.name not in self.exclusiveDisks))
+ def _isIgnoredDisk(self, disk):
+ return ((self.ignoredDisks and disk.name in self.ignoredDisks) or
+ (self.exclusiveDisks and
+ disk.name not in self.exclusiveDisks))
+ def _hideIgnoredDisks(self):
# hide any subtrees that begin with an ignored disk
for disk in [d for d in self._devices if d.isDisk]:
Might as well change
this to a generator expression.
--
Vratislav Podzimek
Anaconda Rider | Red Hat, Inc. | Brno - Czech Republic