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/Rsync.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/Rsync.hs')
| -rw-r--r-- | Remote/Rsync.hs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Remote/Rsync.hs b/Remote/Rsync.hs index ca4236276..f073e7bd7 100644 --- a/Remote/Rsync.hs +++ b/Remote/Rsync.hs @@ -141,7 +141,7 @@ remove o k = withRsyncScratchDir $ \tmp -> do checkPresent :: Git.Repo -> RsyncOpts -> Key -> Annex (Either IOException Bool) checkPresent r o k = do - showNote ("checking " ++ Git.repoDescribe r ++ "...") + showAction $ "checking " ++ Git.repoDescribe r -- note: Does not currently differnetiate between rsync failing -- to connect, and the file not being present. res <- liftIO $ boolSystem "sh" [Param "-c", Param cmd] @@ -174,7 +174,7 @@ withRsyncScratchDir a = do rsyncRemote :: RsyncOpts -> [CommandParam] -> Annex Bool rsyncRemote o params = do - showProgress -- make way for progress bar + showOutput -- make way for progress bar res <- liftIO $ rsync $ rsyncOptions o ++ defaultParams ++ params if res then return res |