From 39dd5a2ac3b2371a250667624a67e9272f4724fa Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 28 Oct 2014 15:54:44 -0400 Subject: [PATCH] improve uuid mismatch message --- Remote/GCrypt.hs | 2 +- ..._1bb55c9a35d9447a31237c8bfa24dba9._comment | 21 +++++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 doc/bugs/problems_with_enableremote_on_gcrypt_remote___40__hosted_with_gitolite__41__/comment_2_1bb55c9a35d9447a31237c8bfa24dba9._comment diff --git a/Remote/GCrypt.hs b/Remote/GCrypt.hs index 995c3e8389..9aa70d57e6 100644 --- a/Remote/GCrypt.hs +++ b/Remote/GCrypt.hs @@ -202,7 +202,7 @@ gCryptSetup mu _ c = go $ M.lookup "gitrepo" c method <- setupRepo gcryptid =<< inRepo (Git.Construct.fromRemoteLocation gitrepo) gitConfigSpecialRemote u c' "gcrypt" (fromAccessMethod method) return (c', u) - else error $ "uuid mismatch " ++ show (u, mu, gcryptid) + else error $ "uuid mismatch; expected " ++ show mu ++ " but remote gitrepo has " ++ show u ++ " (" ++ show gcryptid ++ ")" {- Sets up the gcrypt repository. The repository is either a local - repo, or it is accessed via rsync directly, or it is accessed over ssh diff --git a/doc/bugs/problems_with_enableremote_on_gcrypt_remote___40__hosted_with_gitolite__41__/comment_2_1bb55c9a35d9447a31237c8bfa24dba9._comment b/doc/bugs/problems_with_enableremote_on_gcrypt_remote___40__hosted_with_gitolite__41__/comment_2_1bb55c9a35d9447a31237c8bfa24dba9._comment new file mode 100644 index 0000000000..c26b0a390d --- /dev/null +++ b/doc/bugs/problems_with_enableremote_on_gcrypt_remote___40__hosted_with_gitolite__41__/comment_2_1bb55c9a35d9447a31237c8bfa24dba9._comment @@ -0,0 +1,21 @@ +[[!comment format=mdwn + username="joey" + subject="""comment 2""" + date="2014-10-28T19:40:37Z" + content=""" +The uuid mismatch message tells me that you have tried to enable a special +remote that has uuid 984e0333-3327-5f21-87a1-35d30f37f337. However, when +it checked the gcrypt repository, it found that it had gcrypt id +":id:8sucFsBZIGQKXFv5ecSW", which means its uuid should be +78104a6f-16a9-504b-8e8a-d8a3c59351e8. I have improved that message to be +more clear. + +Since `git annex info` doesn't list that +78104a6f-16a9-504b-8e8a-d8a3c59351e8 uuid at all, it seems that +this gcrypt repository has not been initialized using `git-annex +initremote`. It's not a gcrypt special remote, but instead is a gcrypt +repository, that was probably created using `git push`. You can convert it +to a gcrypt special remote by running `git-annex initremote` and providing +its repourl. Once that's done and pushed, you will be able to `git annex +enableremote` it elsewhere. +"""]]