diff options
author | Joey Hess <joey@kitenet.net> | 2011-07-19 14:07:23 -0400 |
---|---|---|
committer | Joey Hess <joey@kitenet.net> | 2011-07-19 14:07:23 -0400 |
commit | 00153eed48a2328969cc08688ef674a4c19c2014 (patch) | |
tree | f2ee8ac90225d1d2329f45b43061b53b7757d815 /Remote/Web.hs | |
parent | ec9e9343d9fa99b0786ee93ff142484e2402d3c8 (diff) |
unify elipsis handling
And add a simple dots-based progress display, currently only used in v2
upgrade.
Diffstat (limited to 'Remote/Web.hs')
-rw-r--r-- | Remote/Web.hs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Remote/Web.hs b/Remote/Web.hs index 60f64cfe0..2f8fac23b 100644 --- a/Remote/Web.hs +++ b/Remote/Web.hs @@ -106,7 +106,7 @@ checkKey key = do checkKey' :: [URLString] -> Annex Bool checkKey' [] = return False checkKey' (u:us) = do - showNote ("checking " ++ u) + showAction $ "checking " ++ u e <- liftIO $ urlexists u if e then return e else checkKey' us @@ -129,6 +129,6 @@ urlexists url = download :: [URLString] -> FilePath -> Annex Bool download [] _ = return False download (url:us) file = do - showProgress -- make way for curl progress bar + showOutput -- make way for curl progress bar ok <- liftIO $ boolSystem "curl" [Params "-L -C - -# -o", File file, File url] if ok then return ok else download us file |