summaryrefslogtreecommitdiff
path: root/src/Propellor
diff options
context:
space:
mode:
authorFĂ©lix Sipma2015-12-17 10:18:53 +0100
committerJoey Hess2015-12-17 13:29:13 -0400
commit1bc9d8200b8fa97d97a79a002eb60339790fa259 (patch)
treea3a6b3687b88825262bcabdf8ca9d2a1d518d008 /src/Propellor
parent9b9bf6028275e54da2df24b7413a585d5c84b254 (diff)
Gpg: fix gpg parameters in hasPrivKey and hasPubKey
(cherry picked from commit 04464ae17a7396d0cafffefc2880e68f40fc42ad)
Diffstat (limited to 'src/Propellor')
-rw-r--r--src/Propellor/Property/Gpg.hs4
1 files changed, 2 insertions, 2 deletions
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