diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-03-09 19:26:02 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-03-09 20:03:51 -0400 |
| commit | bca3fd65b9cd3c2224144349505ddda20361b59e (patch) | |
| tree | d846b257afccf262a8f8223834af8a67c11bf5c8 /Locations.hs | |
| parent | d6e77595ba45762b3c2dfdcd47a2d6b5b70154ae (diff) | |
fix key directory hash calculation code
Fix Key directory hash calculation code to behave as it did before version
3.20120227 when a key contains non-ascii.
The hash directories for a given Key are based on its md5sum.
Prior to ghc 7.4, Keys contained raw, undecoded bytes, so the md5sum was
taken of each byte in turn. With the ghc 7.4 filename encoding change,
keys contains decoded unicode characters (possibly with surrigates for
undecodable bytes). This changes the result of the md5sum, since the md5sum
used is pure haskell and supports unicode. And that won't do, as git-annex
will start looking in a different hash directory for the content of a key.
The surrigates are particularly bad, since that's essentially a ghc
implementation detail, so could change again at any time. Also, changing
the locale changes how the bytes are decoded, which can also change
the md5sum.
Symptoms would include things like:
* git annex fsck would complain that no copies existed of a file,
despite its symlink pointing to the content that was locally present
* git annex fix would change the symlink to use the wrong hash
directory.
Only WORM backend is likely to have been affected, since only it tends
to include much filename data (SHA1E could in theory also be affected).
I have not tried to support the hash directories used by git-annex versions
3.20120227 to 3.20120308, so things added with those versions with WORM
will require manual fixups. Sorry for the inconvenience!
Diffstat (limited to 'Locations.hs')
| -rw-r--r-- | Locations.hs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Locations.hs b/Locations.hs index 18df06004..2e3372551 100644 --- a/Locations.hs +++ b/Locations.hs @@ -218,12 +218,12 @@ hashDirMixed :: Hasher hashDirMixed k = addTrailingPathSeparator $ take 2 dir </> drop 2 dir where dir = take 4 $ display_32bits_as_dir =<< [a,b,c,d] - ABCD (a,b,c,d) = md5 $ Str $ show k + ABCD (a,b,c,d) = md5 $ Str $ encodeFilePath $ show k hashDirLower :: Hasher hashDirLower k = addTrailingPathSeparator $ take 3 dir </> drop 3 dir where - dir = take 6 $ md5s $ Str $ show k + dir = take 6 $ md5s $ Str $ encodeFilePath $ show k {- modified version of display_32bits_as_hex from Data.Hash.MD5 - Copyright (C) 2001 Ian Lynagh |