diff options
| author | David Cantrell <dcantrell@redhat.com> | 2009-04-01 17:16:45 -1000 |
|---|---|---|
| committer | David Cantrell <dcantrell@redhat.com> | 2009-04-02 10:33:34 -1000 |
| commit | 20d1409a3799a855d087a262b31c9cf9705a460a (patch) | |
| tree | 5c5623593c2e328d0e855c3be7f3d246f07d4e52 | |
| parent | 9f1dbde5b3df98d5307a93706ecb9f697b57569a (diff) | |
| download | anaconda-20d1409a3799a855d087a262b31c9cf9705a460a.tar.gz anaconda-20d1409a3799a855d087a262b31c9cf9705a460a.tar.xz anaconda-20d1409a3799a855d087a262b31c9cf9705a460a.zip | |
Handle format actions in cancelAction()
| -rw-r--r-- | storage/devicetree.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/storage/devicetree.py b/storage/devicetree.py index 4a1aebaca..603aa7422 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. |