From eb6eee8d8ff3db25237d64153277114aa4c99055 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 7 Mar 2016 17:18:33 -0400 Subject: use catchIO --- src/Propellor/Property/FreeBSD/Pkg.hs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/Propellor/Property/FreeBSD/Pkg.hs b/src/Propellor/Property/FreeBSD/Pkg.hs index 1d6e1f68..913710f7 100644 --- a/src/Propellor/Property/FreeBSD/Pkg.hs +++ b/src/Propellor/Property/FreeBSD/Pkg.hs @@ -77,7 +77,9 @@ isInstallable :: Package -> IO Bool isInstallable p = (not <$> isInstalled p) <&&> exists p isInstalled :: Package -> IO Bool -isInstalled p = catch (runPkg "info" [p] >> return True) (\(_ :: IOError ) -> return False) +isInstalled p = (runPkg "info" [p] >> return True) + `catchIO` (\_ -> return False) exists :: Package -> IO Bool -exists p = catch (runPkg "search" ["--search", "name", "--exact", p] >> return True) (\(_ :: IOError ) -> return False) +exists p = (runPkg "search" ["--search", "name", "--exact", p] >> return True) + `catchIO` (\_ -> return False) -- cgit v1.2.3