diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-08-24 17:42:23 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-08-24 17:42:23 -0400 |
| commit | 414fa8375e5ba2fe21bfa70f9bec4a54cd0f16db (patch) | |
| tree | 8e0bb6e6c72c43ab888a5dece1dbb0348a5e8081 | |
| parent | dda61b1b80c42ab91a846537c0cab93a497562a8 (diff) | |
| parent | c387f98bc99c6276b29fba07a1ce6746e294259f (diff) | |
Merge branch 'master' of ssh://git-annex.branchable.com
| -rw-r--r-- | Backend/SHA.hs | 2 | ||||
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | doc/bugs/fsck_thinks_file_content_is_bad_when_it_isn__39__t.mdwn | 5 | ||||
| -rw-r--r-- | doc/install/OSX.mdwn | 5 |
4 files changed, 13 insertions, 1 deletions
diff --git a/Backend/SHA.hs b/Backend/SHA.hs index cf61139e0..3ac1463ad 100644 --- a/Backend/SHA.hs +++ b/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 diff --git a/debian/changelog b/debian/changelog index d81d1661d..2a3ecc604 100644 --- a/debian/changelog +++ b/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 diff --git a/doc/bugs/fsck_thinks_file_content_is_bad_when_it_isn__39__t.mdwn b/doc/bugs/fsck_thinks_file_content_is_bad_when_it_isn__39__t.mdwn index 883c53d36..e9051f9f3 100644 --- a/doc/bugs/fsck_thinks_file_content_is_bad_when_it_isn__39__t.mdwn +++ b/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]] diff --git a/doc/install/OSX.mdwn b/doc/install/OSX.mdwn index 3c2460968..261959c7b 100644 --- a/doc/install/OSX.mdwn +++ b/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]] |