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

Fix enabling of gcrypt repository accessed over ssh; git-annex-shell gcryptsetup had a bug that caused it to fail with permission denied.

Browse source
This commit is contained in:
Joey Hess 2013-11-02 20:15:40 -04:00
parent 2203690822
commit dff303aa43
2 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Command/GCryptSetup.hs
View file

@ -23,13 +23,17 @@ seek = [withStrings start]
start :: String -> CommandStart start :: String -> CommandStart
start gcryptid = next $ next $ do start gcryptid = next $ next $ do
g <- gitRepo
u <- getUUID u <- getUUID
when (u /= NoUUID) $
error "gcryptsetup refusing to run; this repository already has a git-annex uuid!"
g <- gitRepo
gu <- Remote.GCrypt.getGCryptUUID True g gu <- Remote.GCrypt.getGCryptUUID True g
if u == NoUUID && gu == Nothing let newgu = genUUIDInNameSpace gCryptNameSpace gcryptid
if gu == Nothing || gu == Just newgu
then if Git.repoIsLocalBare g then if Git.repoIsLocalBare g
then do then do
void $ Remote.GCrypt.setupRepo gcryptid g void $ Remote.GCrypt.setupRepo gcryptid g
return True return True
else error "cannot use gcrypt in a non-bare repository" else error "cannot use gcrypt in a non-bare repository"
else error "gcryptsetup permission denied" else error "gcryptsetup uuid mismatch"

3
debian/changelog vendored
View file

@ -6,6 +6,9 @@ git-annex (4.20131102) UNRELEASED; urgency=low
with no master branch. with no master branch.
* gcrypt, bup: Fix bug that prevented using these special remotes * gcrypt, bup: Fix bug that prevented using these special remotes
with encryption=pubkey. with encryption=pubkey.
* Fix enabling of gcrypt repository accessed over ssh;
git-annex-shell gcryptsetup had a bug that caused it to fail
with permission denied.
-- Joey Hess <joeyh@debian.org> Sat, 02 Nov 2013 14:54:36 -0400 -- Joey Hess <joeyh@debian.org> Sat, 02 Nov 2013 14:54:36 -0400