diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-10-11 14:21:06 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-10-11 14:21:06 -0400 |
| commit | 388d27825323091f317ed380e3105f88df3f66cb (patch) | |
| tree | 24e27eef33ae4949affe6d42079dd07d7a925cc2 /Remote | |
| parent | 6af9822118dca6c9416c0d13635b13ee68bd13f6 (diff) | |
| parent | f81b89510d558ee38e6338c433e4f1b01c2cd5f3 (diff) | |
Merge branch 'master' into incrementalfsck
Diffstat (limited to 'Remote')
| -rw-r--r-- | Remote/Git.hs | 2 | ||||
| -rw-r--r-- | Remote/Web.hs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Remote/Git.hs b/Remote/Git.hs index e8ab57281..4cdedd064 100644 --- a/Remote/Git.hs +++ b/Remote/Git.hs @@ -241,7 +241,7 @@ inAnnex r key where checkhttp headers = do showChecking r - ifM (anyM (\u -> Url.withUserAgent $ Url.check u headers (keySize key)) (keyUrls r key)) + ifM (anyM (\u -> Url.withUserAgent $ Url.checkBoth u headers (keySize key)) (keyUrls r key)) ( return $ Right True , return $ Left "not found" ) diff --git a/Remote/Web.hs b/Remote/Web.hs index af60beee0..ce420b24d 100644 --- a/Remote/Web.hs +++ b/Remote/Web.hs @@ -118,7 +118,7 @@ checkKey' key us = firsthit us (Right False) $ \u -> do #endif DefaultDownloader -> do headers <- getHttpHeaders - Right <$> Url.withUserAgent (Url.check u' headers $ keySize key) + Right <$> Url.withUserAgent (Url.checkBoth u' headers $ keySize key) where firsthit [] miss _ = return miss firsthit (u:rest) _ a = do |