summaryrefslogtreecommitdiff
path: root/src/Propellor
diff options
context:
space:
mode:
authorJoey Hess2015-09-15 11:22:31 -0400
committerJoey Hess2015-09-15 11:22:31 -0400
commite1436ff33d8e90972db10fcd8e891b7c222bf28a (patch)
tree1909acf0265c5b9aaf6f880767de9d9fb49a5880 /src/Propellor
parent0f8a294efcdaa0f4802910cd988e72f32c71d05b (diff)
parent00e824fd0460d5275fc6c6730dd701623f3492c3 (diff)
Merge branch 'joeyconfig'
Diffstat (limited to 'src/Propellor')
-rw-r--r--src/Propellor/Gpg.hs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/Propellor/Gpg.hs b/src/Propellor/Gpg.hs
index 24743d40..f2ae8f9a 100644
--- a/src/Propellor/Gpg.hs
+++ b/src/Propellor/Gpg.hs
@@ -99,7 +99,7 @@ gitCommit ps = do
gpgDecrypt :: FilePath -> IO String
gpgDecrypt f = ifM (doesFileExist f)
- ( readProcess "gpg" ["--decrypt", f]
+ ( writeReadProcessEnv "gpg" ["--decrypt", f] Nothing Nothing (Just fileEncoding)
, return ""
)