diff options
| author | Joey Hess <joeyh@joeyh.name> | 2015-09-15 11:22:31 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-09-15 11:22:31 -0400 |
| commit | e1436ff33d8e90972db10fcd8e891b7c222bf28a (patch) | |
| tree | 1909acf0265c5b9aaf6f880767de9d9fb49a5880 /src | |
| parent | 0f8a294efcdaa0f4802910cd988e72f32c71d05b (diff) | |
| parent | 00e824fd0460d5275fc6c6730dd701623f3492c3 (diff) | |
Merge branch 'joeyconfig'
Diffstat (limited to 'src')
| -rw-r--r-- | src/Propellor/Gpg.hs | 2 | ||||
| -rw-r--r-- | src/Utility/Process.hs | 2 |
2 files changed, 1 insertions, 3 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 "" ) diff --git a/src/Utility/Process.hs b/src/Utility/Process.hs index 05205de8..c4882a01 100644 --- a/src/Utility/Process.hs +++ b/src/Utility/Process.hs @@ -60,7 +60,6 @@ import Prelude import Utility.Misc import Utility.Exception -import Utility.FileSystemEncoding type CreateProcessRunner = forall a. CreateProcess -> ((Maybe Handle, Maybe Handle, Maybe Handle, ProcessHandle) -> IO a) -> IO a @@ -82,7 +81,6 @@ readProcessEnv cmd args environ = readProcess' p readProcess' :: CreateProcess -> IO String readProcess' p = withHandle StdoutHandle createProcessSuccess p $ \h -> do - fileEncoding h output <- hGetContentsStrict h hClose h return output |