[PATCH storage 1/1] Fix pruning between two destroy actions on the same device

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



---
 storage/devicetree.py |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/storage/devicetree.py b/storage/devicetree.py
index 4729810..cf570e5 100644
--- a/storage/devicetree.py
+++ b/storage/devicetree.py
@@ -196,6 +196,9 @@ class DeviceTree(object):
                 end = self._actions.index(loops[-1])
                 if start < self._actions.index(rem) <= end:
                     self._actions.remove(rem)
+                    # last destroy action removed
+                    if rem == loops[-1]:
+                        break
 
         # device create actions
         actions = self.findActions(type="create", object="device")
@@ -579,7 +582,7 @@ class DeviceTree(object):
                 path -- device path to match (string, or None to match any)
 
         """
-        if device is None and type is None and object is None:
+        if device is None and type is None and object is None and path is None:
             return self._actions[:]
 
         # convert the string arguments to the types used in actions
-- 
1.5.4.3

_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list

[Index of Archives]     [Kickstart]     [Fedora Users]     [Fedora Legacy List]     [Fedora Maintainers]     [Fedora Desktop]     [Fedora SELinux]     [Big List of Linux Books]     [Yosemite News]     [Yosemite Photos]     [KDE Users]     [Fedora Tools]
  Powered by Linux