summaryrefslogtreecommitdiff
path: root/src/Propellor/Exception.hs
diff options
context:
space:
mode:
authorJoey Hess2015-05-06 14:29:12 -0400
committerJoey Hess2015-05-06 14:29:12 -0400
commit9ec4b33dbb62e42b8d284d1aeddf32a395fd7cc0 (patch)
treeb9067a945a430af4868be1a0fcf052db5c4cd5fc /src/Propellor/Exception.hs
parentb4877efea5375cb83951d6dd1d3dbf9d70208cf8 (diff)
parent160eff0eb7ebbb2da2c3864dbe83bf7db76c8bb6 (diff)
Merge branch 'joeyconfig'
Diffstat (limited to 'src/Propellor/Exception.hs')
-rw-r--r--src/Propellor/Exception.hs8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/Propellor/Exception.hs b/src/Propellor/Exception.hs
index f6fd15f1..2b38af0c 100644
--- a/src/Propellor/Exception.hs
+++ b/src/Propellor/Exception.hs
@@ -2,11 +2,11 @@
module Propellor.Exception where
-import qualified "MonadCatchIO-transformers" Control.Monad.CatchIO as M
-import Control.Exception
-
import Propellor.Types
import Propellor.Message
+import Utility.Exception
+
+import Control.Exception (IOException)
-- | Catches IO exceptions and returns FailedChange.
catchPropellor :: Propellor Result -> Propellor Result
@@ -15,4 +15,4 @@ catchPropellor a = either err return =<< tryPropellor a
err e = warningMessage (show e) >> return FailedChange
tryPropellor :: Propellor a -> Propellor (Either IOException a)
-tryPropellor = M.try
+tryPropellor = try