diff options
author | Joey Hess <joey@kitenet.net> | 2013-09-18 15:30:53 -0400 |
---|---|---|
committer | Joey Hess <joey@kitenet.net> | 2013-09-18 15:55:31 -0400 |
commit | 4c86cf524c7a6161af3c9fbb56f61c3cb6305fef (patch) | |
tree | 745db48f9b7a2fa42894ed7f3182408ba3cc2e72 /Assistant/DeleteRemote.hs | |
parent | ba037cce74469e7e28019b63cdea55e8400bc5e7 (diff) |
webapp: support adding existing gcrypt special remotes from removable drives
When adding a removable drive, it's now detected if the drive contains
a gcrypt special remote, and that's all handled nicely. This includes
fetching the git-annex branch from the gcrypt repo in order to find
out how to set up the special remote.
Note that gcrypt repos that are not git-annex special remotes are not
supported. It will attempt to detect such a gcrypt repo and refuse
to use it. (But this is hard to do any may fail; see
https://github.com/blake2-ppc/git-remote-gcrypt/issues/6)
The problem with supporting regular gcrypt repos is that we don't know
what the gcrypt.participants setting is intended to be for the repo.
So even if we can decrypt it, if we push changes to it they might not be
visible to other participants.
Anyway, encrypted sneakernet (or mailnet) is now fully possible with the
git-annex assistant! Assuming that the gpg key distribution is handled
somehow, which the assistant doesn't yet help with.
This commit was sponsored by Navishkar Rao.
Diffstat (limited to 'Assistant/DeleteRemote.hs')
-rw-r--r-- | Assistant/DeleteRemote.hs | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/Assistant/DeleteRemote.hs b/Assistant/DeleteRemote.hs index 2e06d52cd..6a77eedc6 100644 --- a/Assistant/DeleteRemote.hs +++ b/Assistant/DeleteRemote.hs @@ -17,8 +17,7 @@ import Logs.Location import Assistant.DaemonStatus import qualified Remote import Remote.List -import qualified Git.Command -import qualified Git.BuildVersion +import qualified Git.Remote import Logs.Trust import qualified Annex @@ -35,15 +34,7 @@ disableRemote uuid = do remote <- fromMaybe (error "unknown remote") <$> liftAnnex (Remote.remoteFromUUID uuid) liftAnnex $ do - inRepo $ Git.Command.run - [ Param "remote" - -- name of this subcommand changed - , Param $ - if Git.BuildVersion.older "1.8.0" - then "rm" - else "remove" - , Param (Remote.name remote) - ] + inRepo $ Git.Remote.remove (Remote.name remote) void $ remoteListRefresh updateSyncRemotes return remote |