From 1bc9d8200b8fa97d97a79a002eb60339790fa259 Mon Sep 17 00:00:00 2001 From: FĂ©lix Sipma Date: Thu, 17 Dec 2015 10:18:53 +0100 Subject: Gpg: fix gpg parameters in hasPrivKey and hasPubKey (cherry picked from commit 04464ae17a7396d0cafffefc2880e68f40fc42ad) --- src/Propellor/Property/Gpg.hs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/Propellor/Property') diff --git a/src/Propellor/Property/Gpg.hs b/src/Propellor/Property/Gpg.hs index fe339297..0f1c70ea 100644 --- a/src/Propellor/Property/Gpg.hs +++ b/src/Propellor/Property/Gpg.hs @@ -55,8 +55,8 @@ dotDir (User u) = do hasPrivKey :: GpgKeyId -> User -> IO Bool hasPrivKey (GpgKeyId keyid) (User u) = catchBoolIO $ - snd <$> processTranscript "su" ["-c", "gpg --list-secret-keys", keyid, u] Nothing + snd <$> processTranscript "su" ["-c", "gpg --list-secret-keys " ++ shellEscape keyid, u] Nothing hasPubKey :: GpgKeyId -> User -> IO Bool hasPubKey (GpgKeyId keyid) (User u) = catchBoolIO $ - snd <$> processTranscript "su" ["-c", "gpg --list-public-keys", keyid, u] Nothing + snd <$> processTranscript "su" ["-c", "gpg --list-public-keys " ++ shellEscape keyid, u] Nothing -- cgit v1.2.3