[PATCH 3/3] Handle format actions in cancelAction()

[David Cantrell <dcantrell redhat com>]

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

diff --git a/storage/devicetree.py b/storage/devicetree.py
index 4a1aeba..603aa74 100644
--- a/storage/devicetree.py
+++ b/storage/devicetree.py
@@ -749,6 +749,10 @@ class DeviceTree(object):
         elif action.isDestroy() and action.isDevice():
             # add the device back into the tree
             self._addDevice(action.device)
+        elif action.isFormat() and \
+             (action.isCreate() or action.isMigrate() or action.isResize()):
+            action.cancel()
+            self._actions.remove(action)
 
     def findActions(self, device=None, type=None, object=None, path=None):
         """ Find all actions that match all specified parameters.
-- 
1.6.2