mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

tahoe: Use ~/.tahoe-git-annex/ rather than ~/.tahoe/git-annex/ to avoid old versions of tahoe create-client choking.

Browse source
This commit is contained in:
Joey Hess 2015-06-09 15:29:16 -04:00
parent 4bc46e4d98
commit 800e9f2658
3 changed files with 13 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Remote/Tahoe.hs
View file

@ -9,7 +9,7 @@
- configuration, when embedcreds is enabled. - configuration, when embedcreds is enabled.
- -
- Using those creds, git-annex sets up a tahoe configuration directory in - Using those creds, git-annex sets up a tahoe configuration directory in
- ~/.tahoe/git-annex/UUID/ - ~/.tahoe-git-annex/UUID/
- -
- Tahoe has its own encryption, so git-annex's encryption is not used. - Tahoe has its own encryption, so git-annex's encryption is not used.
- -
@ -141,7 +141,7 @@ checkKey u hdl k = go =<< getCapability u k
defaultTahoeConfigDir :: UUID -> IO TahoeConfigDir defaultTahoeConfigDir :: UUID -> IO TahoeConfigDir
defaultTahoeConfigDir u = do defaultTahoeConfigDir u = do
h <- myHomeDir h <- myHomeDir
return $ h </> ".tahoe" </> "git-annex" </> fromUUID u return $ h </> ".tahoe-git-annex" </> fromUUID u
tahoeConfigure :: TahoeConfigDir -> IntroducerFurl -> Maybe SharedConvergenceSecret -> IO SharedConvergenceSecret tahoeConfigure :: TahoeConfigDir -> IntroducerFurl -> Maybe SharedConvergenceSecret -> IO SharedConvergenceSecret
tahoeConfigure configdir furl mscs = do tahoeConfigure configdir furl mscs = do

2
debian/changelog vendored
View file

@ -21,6 +21,8 @@ git-annex (5.20150529) UNRELEASED; urgency=medium
--all/--unused/--key mode or a in a bare repo. Closes: #753888 --all/--unused/--key mode or a in a bare repo. Closes: #753888
Otherwise, still reports files with lost contents, even if the content Otherwise, still reports files with lost contents, even if the content
is dead. is dead.
* tahoe: Use ~/.tahoe-git-annex/ rather than ~/.tahoe/git-annex/
to avoid old versions of tahoe create-client choking.
-- Joey Hess <id@joeyh.name> Sat, 30 May 2015 02:07:18 -0400 -- Joey Hess <id@joeyh.name> Sat, 30 May 2015 02:07:18 -0400

9
doc/bugs/Can__39__t_initialize_Tahoe_special_remote.mdwn
View file

@ -29,3 +29,12 @@ git-annex: tahoe create-client failed
# End of transcript or log. # End of transcript or log.
"""]] """]]
> So this was caused by an old version of tahoe-lafs. Might as
> well support older versions if we can easily, I suppose.
>
> I have gone ahead and changed git-annex to use ~/.tahoe-git-annex/
> instead of ~/.tahoe/git-annex/ when setting up new remotes.
> Existing remote's configs will be unchanged.
>
> So, [[fixed|done]] --[[Joey]]