[PATCH] Always run action's cancel method as part of cancelAction.
Brian C. Lane
bcl at redhat.com
Wed Dec 4 22:12:12 UTC 2013
On Wed, Dec 04, 2013 at 11:23:10AM -0600, David Lehman wrote:
> Related: rhbz#1027947
> ---
> blivet/devicetree.py | 4 +---
> 1 file changed, 1 insertion(+), 3 deletions(-)
>
> diff --git a/blivet/devicetree.py b/blivet/devicetree.py
> index 1324499..7f96681 100644
> --- a/blivet/devicetree.py
> +++ b/blivet/devicetree.py
> @@ -369,10 +369,8 @@ 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.isResize):
> - action.cancel()
>
> + action.cancel()
> self._actions.remove(action)
>
> def findActions(self, device=None, type=None, object=None, path=None,
> --
> 1.8.1.4
Ack
--
Brian C. Lane | Anaconda Team | IRC: bcl #anaconda | Port Orchard, WA (PST8PDT)
More information about the anaconda-patches
mailing list