diff options
| author | Joey Hess <joey@kitenet.net> | 2014-04-23 14:04:09 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-04-23 14:04:09 -0400 |
| commit | e0aff931023a6c3f7a06caaa5dfa1aad2da3889d (patch) | |
| tree | f1960ca033d5196da417e7c4d1f0e579bdc21e46 /Utility/Rsync.hs | |
| parent | 232fce59fabc4243c9b9d7944589986c5cc73f16 (diff) | |
| download | git-repair-e0aff931023a6c3f7a06caaa5dfa1aad2da3889d.tar.gz | |
merge from git-annex
Diffstat (limited to 'Utility/Rsync.hs')
| -rw-r--r-- | Utility/Rsync.hs | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Utility/Rsync.hs b/Utility/Rsync.hs index 2c5e39b..82166f6 100644 --- a/Utility/Rsync.hs +++ b/Utility/Rsync.hs @@ -124,6 +124,9 @@ rsyncUrlIsPath s - after the \r is the number of bytes processed. After the number, - there must appear some whitespace, or we didn't get the whole number, - and return the \r and part we did get, for later processing. + - + - In some locales, the number will have one or more commas in the middle + - of it. -} parseRsyncProgress :: String -> (Maybe Integer, String) parseRsyncProgress = go [] . reverse . progresschunks @@ -142,7 +145,7 @@ parseRsyncProgress = go [] . reverse . progresschunks parsebytes s = case break isSpace s of ([], _) -> Nothing (_, []) -> Nothing - (b, _) -> readish b + (b, _) -> readish $ filter (/= ',') b {- Filters options to those that are safe to pass to rsync in server mode, - without causing it to eg, expose files. -} |