summaryrefslogtreecommitdiff
path: root/src/Propellor
diff options
context:
space:
mode:
authorFĂ©lix Sipma2015-12-16 19:11:54 +0100
committerJoey Hess2015-12-17 13:29:06 -0400
commit9b9bf6028275e54da2df24b7413a585d5c84b254 (patch)
treee44ebb73717ea27b40e98c15973367075177c814 /src/Propellor
parent05dafa48efaad859665902c11e179a7cbdd8f433 (diff)
hlint
(cherry picked from commit e2d86f812bd37de9cda7d4ecc0e5b84821f359c1)
Diffstat (limited to 'src/Propellor')
-rw-r--r--src/Propellor/Gpg.hs10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/Propellor/Gpg.hs b/src/Propellor/Gpg.hs
index 960c70d3..949eb5b5 100644
--- a/src/Propellor/Gpg.hs
+++ b/src/Propellor/Gpg.hs
@@ -79,12 +79,12 @@ rmKey keyid = exitBool =<< allM (uncurry actionMessage)
]
where
rmkeyring = boolSystem "gpg" $
- (map Param useKeyringOpts) ++
+ (map Param useKeyringOpts) ++
[ Param "--batch"
, Param "--yes"
, Param "--delete-key", Param keyid
]
-
+
gitconfig = ifM ((==) (keyid++"\n", True) <$> processTranscript "git" ["config", "user.signingkey"] Nothing)
( boolSystem "git"
[ Param "config"
@@ -92,7 +92,7 @@ rmKey keyid = exitBool =<< allM (uncurry actionMessage)
, Param "user.signingkey"
]
, return True
- )
+ )
reencryptPrivData :: IO Bool
reencryptPrivData = ifM (doesFileExist privDataFile)
@@ -101,7 +101,7 @@ reencryptPrivData = ifM (doesFileExist privDataFile)
gitAdd privDataFile
, return True
)
-
+
gitAdd :: FilePath -> IO Bool
gitAdd f = boolSystem "git"
[ Param "add"
@@ -125,7 +125,7 @@ gpgSignParams ps = ifM (doesFileExist keyring)
-- Automatically sign the commit if there'a a keyring.
gitCommit :: Maybe String -> [CommandParam] -> IO Bool
gitCommit msg ps = do
- let ps' = Param "commit" : ps ++
+ let ps' = Param "commit" : ps ++
maybe [] (\m -> [Param "-m", Param m]) msg
ps'' <- gpgSignParams ps'
if isNothing msg