From 7f2d0899817cd7894b44ab014d1a0744691ac7d0 Mon Sep 17 00:00:00 2001 From: Joel Andres Granados Date: Tue, 5 Aug 2008 18:13:12 +0200 Subject: Direct the failure in prepare to the clean step. This is the better way of doing things. If the prepare step is a failure we cannot ensure the sate that the plugin expects. Its best to go to clean and exit with no changes. --- pyfirstaidkit/plugins.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pyfirstaidkit/plugins.py b/pyfirstaidkit/plugins.py index 87d5994..82d7049 100644 --- a/pyfirstaidkit/plugins.py +++ b/pyfirstaidkit/plugins.py @@ -80,7 +80,8 @@ class Plugin(object): # flows["diagnose"] = Flow({ initial : {Return: "prepare"}, - "prepare" : {ReturnSuccess: "diagnose", None: "clean"}, + "prepare" : {ReturnSuccess: "diagnose", ReturnFailure: "clean", + None: "clean"}, "diagnose" : {ReturnSuccess: "clean", ReturnFailure: "clean", None: "clean"}, "clean" : {ReturnSuccess: final, ReturnFailure: final, None: final} @@ -88,7 +89,8 @@ class Plugin(object): flows["fix"] = Flow({ initial : {Return: "prepare"}, - "prepare" : {ReturnSuccess: "diagnose", None: "clean"}, + "prepare" : {ReturnSuccess: "diagnose", ReturnFailure: "clean", + None: "clean"}, "diagnose" : {ReturnSuccess: "clean", ReturnFailure: "backup", None: "clean"}, "backup" : {ReturnSuccess: "fix", ReturnFailure: "clean", -- cgit