summaryrefslogtreecommitdiff
path: root/Command
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2012-01-02 14:20:20 -0400
committerGravatar Joey Hess <joey@kitenet.net>2012-01-02 14:20:20 -0400
commitaa0882691bb2aa64fb13f0df85be0469fd33d98d (patch)
tree365eff7f04e32c88d0c5fbe09fe206be3532aad9 /Command
parent50ebfd265fca5271772ea35ed0aad834a8299298 (diff)
Added remote.name.annex-web-options configuration setting, which can be used to provide parameters to whichever of wget or curl git-annex uses (depends on which is available, but most of their important options suitable for use here are the same).
Diffstat (limited to 'Command')
-rw-r--r--Command/AddUrl.hs3
1 files changed, 1 insertions, 2 deletions
diff --git a/Command/AddUrl.hs b/Command/AddUrl.hs
index 027c508bc..46584f0d8 100644
--- a/Command/AddUrl.hs
+++ b/Command/AddUrl.hs
@@ -12,7 +12,6 @@ import Network.URI
import Common.Annex
import Command
import qualified Backend
-import qualified Utility.Url as Url
import qualified Command.Add
import qualified Annex
import qualified Backend.URL
@@ -45,7 +44,7 @@ download url file = do
let dummykey = Backend.URL.fromUrl url
tmp <- fromRepo $ gitAnnexTmpLocation dummykey
liftIO $ createDirectoryIfMissing True (parentDir tmp)
- stopUnless (liftIO $ Url.download url tmp) $ do
+ stopUnless (downloadUrl [url] tmp) $ do
[(backend, _)] <- Backend.chooseBackends [file]
k <- Backend.genKey tmp backend
case k of