diff options
| author | Joey Hess <joey@kitenet.net> | 2014-10-10 11:36:47 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-10-10 11:36:47 -0400 |
| commit | 07f745ef9ca23982d7ef7e89bd6a638077a65ded (patch) | |
| tree | 9acc6ddda92f98d4c951045d4dcf406207c809ba /src/Propellor/SimpleSh.hs | |
| parent | 2028464268c9e4696c59ee6626a9e315c88ad935 (diff) | |
| parent | 31f84270fddbf07221a6c1ea30e7a8c05db29115 (diff) | |
Merge branch 'joeyconfig'
Conflicts:
debian/changelog
privdata/privdata.gpg
Diffstat (limited to 'src/Propellor/SimpleSh.hs')
| -rw-r--r-- | src/Propellor/SimpleSh.hs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/Propellor/SimpleSh.hs b/src/Propellor/SimpleSh.hs index 7ba30b0e..cc5c62cd 100644 --- a/src/Propellor/SimpleSh.hs +++ b/src/Propellor/SimpleSh.hs @@ -48,8 +48,8 @@ simpleSh namedpipe = do flip catchIO (\_e -> writeChan chan Done) $ do let p = (proc cmd params) - { std_in = Inherit - , std_out = CreatePipe + { std_in = Inherit + , std_out = CreatePipe , std_err = CreatePipe } (Nothing, Just outh, Just errh, pid) <- createProcess p |