mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge branch 'winprocfix'

Browse source
This commit is contained in:
Joey Hess 2015-10-04 15:46:25 -04:00
commit 933fef6ae0
6 changed files with 27 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Build/EvilLinker.hs
View file

@ -21,6 +21,7 @@ import Data.List
import Utility.Monad
import Utility.Process hiding (env)
import qualified Utility.Process
import Utility.Env
data CmdParams = CmdParams
@ -126,7 +127,7 @@ getOutput c ps environ = do
putStrLn $ unwords [c, show ps]
systemenviron <- getEnvironment
let environ' = fromMaybe [] environ ++ systemenviron
out@(_, ok) <- processTranscript' c ps (Just environ') Nothing
out@(_, ok) <- processTranscript' (\p -> p { Utility.Process.env = Just environ' }) c ps Nothing
putStrLn $ unwords [c, "finished", show ok]
return out