Merge branch 'master' of ssh://git-annex.branchable.com

Backend/SHA.hs

@@ -125,5 +125,5 @@ checkKeyChecksum size key file = do
 		_ -> return True
 	where
 		check s
-			| s == dropExtension (keyName key) = True
+			| s == dropExtensions (keyName key) = True
 			| otherwise = False

debian/changelog

@@ -2,6 +2,8 @@ git-annex (3.20120808) UNRELEASED; urgency=low
 
   * S3: Add fileprefix setting.
   * Pass --use-agent to gpg when in no tty mode. Thanks, Eskild Hustvedt.
+  * Bugfix: Fix fsck in SHA*E backends, when the key contains composite
+    extensions, as added in 3.20120721.
 
  -- Joey Hess <joeyh@debian.org>  Thu, 09 Aug 2012 13:51:47 -0400
 

doc/bugs/fsck_thinks_file_content_is_bad_when_it_isn__39__t.mdwn

@@ -28,3 +28,8 @@ The same, as it's the file I was trying to inject:
 ead9db1f34739014a216239d9624bce74d92fe723de06505f9b94cb4c063142ba42b04546f11d3d33869b736e40ded2ff779cb32b26aa10482f09407df0f3c8d  .git/annex/bad/SHA512E-s94402560--ead9db1f34739014a216239d9624bce74d92fe723de06505f9b94cb4c063142ba42b04546f11d3d33869b736e40ded2ff779cb32b26aa10482f09407df0f3c8d.Moon.avi
 
 That's what puzzles me, it is the same file, but for some weird reason git annex thinks it's not.
+
+> Ok, reproduced and fixed the bug. The "E" backends recently got support
+> for 2 levels of filename extensions, but were not made to drop them both
+> when fscking. [[done]] (I'll release a fixed version probably tomorrow;
+> fix is in git now.) --[[Joey]] 

doc/install/OSX.mdwn

@@ -11,6 +11,11 @@ sudo cabal update
 cabal install git-annex --bindir=$HOME/bin
 </pre>
 
+Do not forget to add to your PATH variable your ~/bin folder. In your .bashrc, for example:
+<pre>
+PATH=~/bin:/usr/bin/local:$PATH
+</pre>
+
 See also:
 
 * [[forum/OSX__39__s_haskell-platform_statically_links_things]]