[blivet][master/rhel7-branch] Do not unhide devices with hidden parents (#1158643)

Vojtech Trefny vtrefny at redhat.com
Mon Feb 2 13:04:10 UTC 2015


Signed-off-by: Vojtech Trefny <vtrefny at redhat.com>
---
 blivet/devicetree.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/blivet/devicetree.py b/blivet/devicetree.py
index 97dd6d4..5b0f2bd 100644
--- a/blivet/devicetree.py
+++ b/blivet/devicetree.py
@@ -2023,7 +2023,9 @@ class DeviceTree(object):
 
         # the hidden list should be in leaves-first order
         for hidden in reversed(self._hidden):
-            if hidden == device or hidden.dependsOn(device):
+            if hidden == device or hidden.dependsOn(device) and \
+               not any(parent in self._hidden for parent in hidden.parents):
+
                 log.info("unhiding device %s %s (id %d)", hidden.type,
                                                           hidden.name,
                                                           hidden.id)
-- 
2.1.0



More information about the anaconda-patches mailing list