diff options
| author | Joey Hess <joeyh@joeyh.name> | 2015-11-01 16:53:25 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-11-01 16:53:25 -0400 |
| commit | 592c65d02bf07d053d2fbe8a568f88d1b28e1a65 (patch) | |
| tree | 49a3c1a7aa976043d72ee396681fe11ddd3e0194 /src/Propellor/Gpg.hs | |
| parent | 4d63a9f0ad327cba305e239e51d02e5e33213eda (diff) | |
merge from concurrent-output
Diffstat (limited to 'src/Propellor/Gpg.hs')
| -rw-r--r-- | src/Propellor/Gpg.hs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/Propellor/Gpg.hs b/src/Propellor/Gpg.hs index 9c58a5d1..960c70d3 100644 --- a/src/Propellor/Gpg.hs +++ b/src/Propellor/Gpg.hs @@ -7,6 +7,8 @@ import System.Directory import Data.Maybe import Data.List.Utils import Control.Monad +import System.Console.Concurrent +import System.Console.Concurrent.Internal (ConcurrentProcessHandle(..)) import Propellor.PrivData.Paths import Propellor.Message @@ -16,7 +18,6 @@ import Utility.Monad import Utility.Misc import Utility.Tmp import Utility.FileSystemEncoding -import Utility.ConcurrentOutput type KeyId = String @@ -129,7 +130,7 @@ gitCommit msg ps = do ps'' <- gpgSignParams ps' if isNothing msg then do - (_, _, _, p) <- createProcessForeground $ + (_, _, _, ConcurrentProcessHandle p) <- createProcessForeground $ proc "git" (toCommand ps'') checkSuccessProcess p else boolSystem "git" ps'' |