diff options
| author |  Joey Hess <joey@kitenet.net> | 2011-10-16 00:04:26 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2011-10-16 00:04:26 -0400 |
| commit | 91366c896d9c9cb4519b451a64ed4d1e0ff52cb3 (patch) | |
| tree | f9c7073002f68f1b53ba62890794474301a7253a /Remote | |
| parent | 52c8244219dd90102818282b8b09186f2ce93a0f (diff) | |
clean Annex stuff out of Utility/
Diffstat (limited to 'Remote')
| -rw-r--r-- | Remote/Bup.hs | 2 | ||||
| -rw-r--r-- | Remote/Git.hs | 4 | ||||
| -rw-r--r-- | Remote/Web.hs | 4 |
3 files changed, 6 insertions, 4 deletions
diff --git a/Remote/Bup.hs b/Remote/Bup.hs index 8d36245a9..48014f1da 100644 --- a/Remote/Bup.hs +++ b/Remote/Bup.hs @@ -16,7 +16,7 @@ import Common.Annex import Types.Remote import qualified Git import Config -import Utility.Ssh +import Annex.Ssh import Remote.Helper.Special import Remote.Helper.Encryptable import Crypto diff --git a/Remote/Git.hs b/Remote/Git.hs index 10183522f..8857d821d 100644 --- a/Remote/Git.hs +++ b/Remote/Git.hs @@ -13,7 +13,7 @@ import qualified Data.Map as M import Common.Annex import Utility.CopyFile import Utility.RsyncFile -import Utility.Ssh +import Annex.Ssh import Types.Remote import qualified Git import qualified Annex @@ -164,7 +164,7 @@ copyFromRemote :: Git.Repo -> Key -> FilePath -> Annex Bool copyFromRemote r key file | not $ Git.repoIsUrl r = rsyncOrCopyFile r (gitAnnexLocation r key) file | Git.repoIsSsh r = rsyncHelper =<< rsyncParamsRemote r True key file - | Git.repoIsHttp r = Url.download (keyUrl r key) file + | Git.repoIsHttp r = liftIO $ Url.download (keyUrl r key) file | otherwise = error "copying from non-ssh, non-http repo not supported" {- Tries to copy a key's content to a remote's annex. -} diff --git a/Remote/Web.hs b/Remote/Web.hs index 63963c530..3fea94531 100644 --- a/Remote/Web.hs +++ b/Remote/Web.hs @@ -49,7 +49,9 @@ downloadKey key file = get =<< getUrls key get [] = do warning "no known url" return False - get urls = anyM (`Url.download` file) urls + get urls = do + showOutput -- make way for download progress bar + liftIO $ anyM (`Url.download` file) urls uploadKey :: Key -> Annex Bool uploadKey _ = do |