From 05dafa48efaad859665902c11e179a7cbdd8f433 Mon Sep 17 00:00:00 2001 From: FĂ©lix Sipma Date: Wed, 16 Dec 2015 19:10:56 +0100 Subject: Gpg: use processTranscript in hasPrivKey and hasPubKey (cherry picked from commit 21ffe59d0368f5cfe45316b31d661077e372d512) --- src/Propellor/Property/Gpg.hs | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'src/Propellor') diff --git a/src/Propellor/Property/Gpg.hs b/src/Propellor/Property/Gpg.hs index dae6e5d7..fe339297 100644 --- a/src/Propellor/Property/Gpg.hs +++ b/src/Propellor/Property/Gpg.hs @@ -54,11 +54,9 @@ dotDir (User u) = do return $ home ".gnupg" hasPrivKey :: GpgKeyId -> User -> IO Bool -hasPrivKey (GpgKeyId keyid) (User u) = do - value <- catchMaybeIO $ readProcess "su" ["-c", "gpg --list-secret-keys " ++ keyid, u] - return $ isJust value +hasPrivKey (GpgKeyId keyid) (User u) = catchBoolIO $ + snd <$> processTranscript "su" ["-c", "gpg --list-secret-keys", keyid, u] Nothing hasPubKey :: GpgKeyId -> User -> IO Bool -hasPubKey (GpgKeyId keyid) (User u) = do - value <- catchMaybeIO $ readProcess "su" ["-c", "gpg --list-public-keys " ++ keyid, u] - return $ isJust value +hasPubKey (GpgKeyId keyid) (User u) = catchBoolIO $ + snd <$> processTranscript "su" ["-c", "gpg --list-public-keys", keyid, u] Nothing -- cgit v1.2.3