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

Merge branch 'master' into watch

Browse source
This commit is contained in:
Joey Hess 2012-06-15 15:20:11 -04:00
commit 53d2e81ffd
22 changed files with 249 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Command/AddUrl.hs
View file

@ -73,7 +73,7 @@ download url file = do
liftIO $ createDirectoryIfMissing True (parentDir tmp)
stopUnless (downloadUrl [url] tmp) $ do
backend <- chooseBackend file
let source = KeySource { keyFilename = file, contentLocation = file}
let source = KeySource { keyFilename = file, contentLocation = tmp }
k <- genKey source backend
case k of
Nothing -> stop