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

improve error message when special remote program cannot be run

Browse source
This commit is contained in:
Joey Hess 2015-11-18 12:30:01 -04:00
parent e88582ecad
commit a9a10ee0a9
Failed to extract signature
2 changed files with 19 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Remote/External.hs
View file

@ -369,12 +369,8 @@ startExternal :: ExternalType -> Annex ExternalState
startExternal externaltype = do
errrelayer <- mkStderrRelayer
liftIO $ do
(Just hin, Just hout, Just herr, pid) <- createProcess $
(proc cmd [])
{ std_in = CreatePipe
, std_out = CreatePipe
, std_err = CreatePipe
}
(Just hin, Just hout, Just herr, pid) <-
createProcess p `catchIO` runerr
fileEncoding hin
fileEncoding hout
fileEncoding herr
@ -390,6 +386,13 @@ startExternal externaltype = do
}
where
cmd = externalRemoteProgram externaltype
p = (proc cmd [])
{ std_in = CreatePipe
, std_out = CreatePipe
, std_err = CreatePipe
}
runerr _ = error ("Cannot run " ++ cmd ++ " -- Make sure it's in your PATH and is executable.")
checkearlytermination Nothing = noop
checkearlytermination (Just exitcode) = ifM (inPath cmd)