check rawSystem exit codes
This commit is contained in:
parent
8df3e2aa02
commit
7c975eab07
2 changed files with 10 additions and 8 deletions
|
@ -6,6 +6,7 @@ module Backend.File (backend) where
|
|||
import Control.Monad.State
|
||||
import System.IO
|
||||
import System.Cmd
|
||||
import System.Exit
|
||||
import Control.Exception
|
||||
import BackendTypes
|
||||
import LocationLog
|
||||
|
@ -68,10 +69,11 @@ copyFromRemote r key file = do
|
|||
if (Git.repoIsLocal r)
|
||||
then getlocal
|
||||
else getremote
|
||||
return ()
|
||||
where
|
||||
getlocal = do
|
||||
rawSystem "cp" ["-a", location, file]
|
||||
putStrLn "cp done"
|
||||
res <-rawSystem "cp" ["-a", location, file]
|
||||
if (res == ExitSuccess)
|
||||
then return ()
|
||||
else error "cp failed"
|
||||
getremote = error "get via network not yet implemented!"
|
||||
location = annexLocation r backend key
|
||||
|
|
|
@ -5,7 +5,7 @@ module Backend.Url (backend) where
|
|||
|
||||
import Control.Monad.State
|
||||
import System.Cmd
|
||||
import IO
|
||||
import System.Exit
|
||||
import BackendTypes
|
||||
|
||||
backend = Backend {
|
||||
|
@ -29,7 +29,7 @@ dummyRemove url = return False
|
|||
downloadUrl :: Key -> FilePath -> Annex Bool
|
||||
downloadUrl url file = do
|
||||
liftIO $ putStrLn $ "download: " ++ (show url)
|
||||
result <- liftIO $ try $ rawSystem "curl" ["-#", "-o", file, (show url)]
|
||||
case (result) of
|
||||
Left _ -> return False
|
||||
Right _ -> return True
|
||||
result <- liftIO $ rawSystem "curl" ["-#", "-o", file, (show url)]
|
||||
if (result == ExitSuccess)
|
||||
then return True
|
||||
else return False
|
||||
|
|
Loading…
Reference in a new issue