diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2015-05-12 13:23:22 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-05-12 13:23:22 -0400 |
| commit | 4d49342612dd441cdc503b5294035fc05a9a5a77 (patch) | |
| tree | 435a82d44b5a6aa3df411b36fb9fad2553cc670a /Remote/Tahoe.hs | |
| parent | 44a48a19ffeb8085e7ae1f6bf58d5661adaf8a8d (diff) | |
| parent | 5cd9e10cde3c06ecc6a97f5f60a9def22f959bd2 (diff) | |
Merge branch 'master' into concurrentprogress
Conflicts:
Command/Fsck.hs
Messages.hs
Remote/Directory.hs
Remote/Git.hs
Remote/Helper/Special.hs
Types/Remote.hs
debian/changelog
git-annex.cabal
Diffstat (limited to 'Remote/Tahoe.hs')
| -rw-r--r-- | Remote/Tahoe.hs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Remote/Tahoe.hs b/Remote/Tahoe.hs index ca822d4fd..4a5216194 100644 --- a/Remote/Tahoe.hs +++ b/Remote/Tahoe.hs @@ -177,7 +177,7 @@ getSharedConvergenceSecret configdir = go (60 :: Int) v <- catchMaybeIO (readFile f) case v of Just s | "\n" `isSuffixOf` s || "\r" `isSuffixOf` s -> - return $ takeWhile (`notElem` "\n\r") s + return $ takeWhile (`notElem` ("\n\r" :: String)) s _ -> do threadDelaySeconds (Seconds 1) go (n - 1) |