[master 1/1] Continue with recursive teardown beyond inactive devices.

dwlehman installerbot-noreply at redhat.com
Thu Aug 20 21:57:04 UTC 2015


From: David Lehman <dlehman at redhat.com>

We want to continue to recursively deactivate the parents even if
the current device is inactive, but we don't want to run the
_postTeardown method of a device we're not deactivating.

Related: rhbz#1182229
---
 blivet/devices/storage.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/blivet/devices/storage.py b/blivet/devices/storage.py
index 3fde1be..ebc306a 100644
--- a/blivet/devices/storage.py
+++ b/blivet/devices/storage.py
@@ -424,6 +424,8 @@ def teardown(self, recursive=None):
         log_method_call(self, self.name, status=self.status,
                         controllable=self.controllable)
         if not self._preTeardown(recursive=recursive):
+            if recursive:
+                self.teardownParents(recursive=recursive)
             return
 
         self._teardown(recursive=recursive)


-- 
To view this commit on github, visit https://github.com/rhinstaller/blivet/commit/49e515f2e8b62ce0c4f3f173af3e8e4610e1475e


More information about the anaconda-patches mailing list