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

use safesystem

Browse source
This commit is contained in:
Joey Hess 2010-10-19 01:19:56 -04:00
parent 15986f01d1
commit c7664588f8
4 changed files with 10 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Backend/URL.hs
View file

@ -3,9 +3,11 @@
module Backend.URL (backend) where
import Control.Exception
import Control.Monad.State (liftIO)
import Data.String.Utils
import System.Cmd
import System.Cmd.Utils
import System.Exit
import TypeInternals
@ -36,9 +38,10 @@ downloadUrl :: Key -> FilePath -> Annex Bool
downloadUrl key file = do
showNote "downloading"
liftIO $ putStrLn "" -- make way for curl progress bar
result <- liftIO $ rawSystem "curl" ["-#", "-o", file, url]
if (result == ExitSuccess)
then return True
else return False
result <- liftIO $ (try curl::IO (Either SomeException ()))
case result of
Left err -> return False
Right succ -> return True
where
curl = safeSystem "curl" ["-#", "-o", file, url]
url = join ":" $ drop 1 $ split ":" $ show key