diff options
| author | Richard Hartmann <richih@debian.org> | 2015-12-16 07:23:53 +0100 |
|---|---|---|
| committer | Richard Hartmann <richih@debian.org> | 2015-12-16 07:23:53 +0100 |
| commit | 53679fdc47d9470c2540fbe38d5de38c91c3bb01 (patch) | |
| tree | e3151adb4d04e905dbb930b67cdb959fac5ea513 /Utility/Rsync.hs | |
| parent | c94e89d797b15833875ebeb6adcaa6e130315f8e (diff) | |
| parent | 259c511a17669d043a573344e59eae9e9956265c (diff) | |
| download | git-repair-53679fdc47d9470c2540fbe38d5de38c91c3bb01.tar.gz | |
Merge tag '1.20151215' into debian
tagging package git-repair version 1.20151215
Diffstat (limited to 'Utility/Rsync.hs')
| -rw-r--r-- | Utility/Rsync.hs | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/Utility/Rsync.hs b/Utility/Rsync.hs index ed1eab6..3aaf928 100644 --- a/Utility/Rsync.hs +++ b/Utility/Rsync.hs @@ -1,6 +1,6 @@ {- various rsync stuff - - - Copyright 2010-2013 Joey Hess <joey@kitenet.net> + - Copyright 2010-2013 Joey Hess <id@joeyh.name> - - License: BSD-2-clause -} @@ -44,7 +44,8 @@ rsyncServerParams = -- allow resuming of transfers of big files , Param "--inplace" -- other options rsync normally uses in server mode - , Params "-e.Lsf ." + , Param "-e.Lsf" + , Param "." ] rsyncUseDestinationPermissions :: CommandParam @@ -92,13 +93,13 @@ rsyncUrlIsPath s | rsyncUrlIsShell s = False | otherwise = ':' `notElem` s -{- Runs rsync, but intercepts its progress output and updates a meter. - - The progress output is also output to stdout. +{- Runs rsync, but intercepts its progress output and updates a progress + - meter. - - The params must enable rsync's --progress mode for this to work. -} -rsyncProgress :: MeterUpdate -> [CommandParam] -> IO Bool -rsyncProgress meterupdate = commandMeter parseRsyncProgress meterupdate "rsync" . rsyncParamsFixup +rsyncProgress :: OutputHandler -> MeterUpdate -> [CommandParam] -> IO Bool +rsyncProgress oh meter = commandMeter parseRsyncProgress oh meter "rsync" . rsyncParamsFixup {- Strategy: Look for chunks prefixed with \r (rsync writes a \r before - the first progress output, and each thereafter). The first number |