Merge branch 'joeyconfig'

1 files changed, 4 insertions, 2 deletions

diff --git a/Propellor/Exception.hs b/Propellor/Exception.hs
index bd9212a8..f6fd15f1 100644
--- a/Propellor/Exception.hs
+++ b/Propellor/Exception.hs
@@ -4,13 +4,15 @@ module Propellor.Exception where
 
 import qualified "MonadCatchIO-transformers" Control.Monad.CatchIO as M
 import Control.Exception
-import Control.Applicative
 
 import Propellor.Types
+import Propellor.Message
 
 -- | Catches IO exceptions and returns FailedChange.
 catchPropellor :: Propellor Result -> Propellor Result
-catchPropellor a = either (\_ -> FailedChange) id <$> tryPropellor a
+catchPropellor a = either err return =<< tryPropellor a
+  where
+	err e =  warningMessage (show e) >> return FailedChange
 
 tryPropellor :: Propellor a -> Propellor (Either IOException a)
 tryPropellor = M.try