From f77badde96531d3723c633084dd82597214d0f38 Mon Sep 17 00:00:00 2001 From: FĂ©lix Sipma Date: Mon, 14 Dec 2015 09:24:12 +0100 Subject: Gpg: use isJust (cherry picked from commit 1bb2377598e447e81e20a0e1de1a5d466851d655) --- src/Propellor/Property/Gpg.hs | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'src/Propellor/Property') diff --git a/src/Propellor/Property/Gpg.hs b/src/Propellor/Property/Gpg.hs index 59448bca..34c077bb 100644 --- a/src/Propellor/Property/Gpg.hs +++ b/src/Propellor/Property/Gpg.hs @@ -45,13 +45,9 @@ dotDir (User u) = do hasPrivKey :: GpgKeyId -> User -> IO Bool hasPrivKey (GpgKeyId keyid) (User u) = do value <- catchMaybeIO $ readProcess "su" ["-c", "gpg --list-secret-keys " ++ keyid, u] - return $ case value of - Just _ -> True - _ -> False + return $ isJust value hasPubKey :: GpgKeyId -> User -> IO Bool hasPubKey (GpgKeyId keyid) (User u) = do value <- catchMaybeIO $ readProcess "su" ["-c", "gpg --list-public-keys " ++ keyid, u] - return $ case value of - Just _ -> True - _ -> False + return $ isJust value -- cgit v1.2.3