This has the effect of making self._devices also contain all of self._hidden,
which will break lots of other things.
---
blivet/devicetree.py | 30 ++++++++++++++++++------------
1 file changed, 18 insertions(+), 12 deletions(-)
diff --git a/blivet/devicetree.py b/blivet/devicetree.py
index 691f1b2..d32f09e 100644
--- a/blivet/devicetree.py
+++ b/blivet/devicetree.py
@@ -1914,9 +1914,10 @@ class DeviceTree(object):
return None
found = None
- devices = self._devices
if hidden:
- devices += self._hidden
+ devices = self._devices + self._hidden
+ else:
+ devices += self._devices
for device in devices:
if not incomplete and not getattr(device, "complete", True):
@@ -1934,9 +1935,10 @@ class DeviceTree(object):
return None
found = None
- devices = self._devices
if hidden:
- devices += self._hidden
+ devices = self._devices + self._hidden
+ else:
+ devices = self._devices
for device in devices:
if not incomplete and not getattr(device, "complete", True):
@@ -1953,9 +1955,10 @@ class DeviceTree(object):
return found
def getDevicesBySerial(self, serial, incomplete=False, hidden=False):
- devices = self._devices
if hidden:
- devices += self._hidden
+ devices = self._devices + self._hidden
+ else:
+ devices = self._devices
retval = []
for device in devices:
@@ -1976,9 +1979,10 @@ class DeviceTree(object):
return None
found = None
- devices = self._devices
if hidden:
- devices += self._hidden
+ devices = self._devices + self._hidden
+ else:
+ devices = self._devices
for device in devices:
if not incomplete and not getattr(device, "complete", True):
@@ -2002,9 +2006,10 @@ class DeviceTree(object):
return None
found = None
- devices = self._devices
if hidden:
- devices += self._hidden
+ devices = self._devices + self._hidden
+ else:
+ devices = self._devices
for device in devices:
if not incomplete and not getattr(device, "complete", True):
@@ -2031,9 +2036,10 @@ class DeviceTree(object):
leaf = None
other = None
- devices = self._devices
if hidden:
- devices += self._hidden
+ devices = self._devices + self._hidden
+ else:
+ devices = self._devices
for device in devices:
if not incomplete and not getattr(device, "complete", True):
--
1.8.1.2
Show replies by date
---
blivet/devicetree.py | 3 +++
1 file changed, 3 insertions(+)
diff --git a/blivet/devicetree.py b/blivet/devicetree.py
index d32f09e..1f1ee4f 100644
--- a/blivet/devicetree.py
+++ b/blivet/devicetree.py
@@ -1686,6 +1686,9 @@ class DeviceTree(object):
devicelibs.lvm.lvm_cc_addFilterRejectRegexp(pv.name)
def hide(self, device):
+ if device in self._hidden:
+ return
+
for d in self.getChildren(device):
self.hide(d)
--
1.8.1.2
---
blivet/devicetree.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/blivet/devicetree.py b/blivet/devicetree.py
index 1f1ee4f..c0cbd0f 100644
--- a/blivet/devicetree.py
+++ b/blivet/devicetree.py
@@ -538,7 +538,7 @@ class DeviceTree(object):
sysfs_path = udev_device_get_sysfs_path(info)
vg_name = udev_device_get_lv_vg_name(info)
- device = self.getDeviceByName(vg_name)
+ device = self.getDeviceByName(vg_name, hidden=True)
if device and not isinstance(device, LVMVolumeGroupDevice):
log.warning("found non-vg device with name %s" % vg_name)
device = None
@@ -1882,14 +1882,14 @@ class DeviceTree(object):
# inconsistencies are ignored or resolved.
self._handleInconsistencies()
+ self.teardownAll()
+
# hide any subtrees that begin with an ignored disk
for disk in [d for d in self._devices if d.isDisk]:
if ((self.ignoredDisks and disk.name in self.ignoredDisks) or
(self.exclusiveDisks and disk.name not in self.exclusiveDisks)):
self.hide(disk)
- self.teardownAll()
-
def teardownAll(self):
""" Run teardown methods on all devices. """
if not flags.installer_mode:
--
1.8.1.2
diff --git a/blivet/devicetree.py b/blivet/devicetree.py
index 691f1b2..d32f09e 100644
--- a/blivet/devicetree.py
+++ b/blivet/devicetree.py
@@ -1914,9 +1914,10 @@ class DeviceTree(object):
return None
found = None
- devices = self._devices
if hidden:
- devices += self._hidden
+ devices = self._devices + self._hidden
+ else:
+ devices += self._devices
Missed one here. I'll fix it locally before pushing.
- Chris
These all look okay except please drop the second hunk from patch 3 as
it merits a commit of its own, which I'm happy to do.
Dave
On Tue, 2013-05-21 at 15:26 -0400, Chris Lumens wrote:
> diff --git a/blivet/devicetree.py b/blivet/devicetree.py
> index 691f1b2..d32f09e 100644
> --- a/blivet/devicetree.py
> +++ b/blivet/devicetree.py
> @@ -1914,9 +1914,10 @@ class DeviceTree(object):
> return None
>
> found = None
> - devices = self._devices
> if hidden:
> - devices += self._hidden
> + devices = self._devices + self._hidden
> + else:
> + devices += self._devices
Missed one here. I'll fix it locally before pushing.
- Chris
_______________________________________________
anaconda-patches mailing list
anaconda-patches(a)lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/anaconda-patches