enableremote: When the remote has creds, update the local creds cache file. Before, the old version of the creds could be left there, and would continue to be used.

This commit is contained in:
Joey Hess 2014-10-22 14:28:25 -04:00
parent 3006b79c86
commit 25574bead1
2 changed files with 8 additions and 3 deletions

View file

@ -40,8 +40,10 @@ data CredPairStorage = CredPairStorage
}
{- Stores creds in a remote's configuration, if the remote allows
- that. Otherwise, caches them locally.
- The creds are found in storage if not provided.
- that. Also caches them locally.
-
- The creds are found from the CredPairStorage storage if not provided,
- so may be provided by an environment variable etc.
-
- The remote's configuration should have already had a cipher stored in it
- if that's going to be done, so that the creds can be encrypted using the
@ -54,7 +56,7 @@ setRemoteCredPair encsetup c storage Nothing =
setRemoteCredPair _ c storage (Just creds)
| embedCreds c = case credPairRemoteKey storage of
Nothing -> localcache
Just key -> storeconfig key =<< remoteCipher c
Just key -> storeconfig key =<< remoteCipher =<< localcache
| otherwise = localcache
where
localcache = do

3
debian/changelog vendored
View file

@ -16,6 +16,9 @@ git-annex (5.20141014) UNRELEASED; urgency=medium
* info: When passed the name or uuid of a remote, displays info about that
remote. Remotes that support encryption, chunking, or embedded
creds will include that in their info.
* enableremote: When the remote has creds, update the local creds cache
file. Before, the old version of the creds could be left there, and
would continue to be used.
-- Joey Hess <joeyh@debian.org> Tue, 14 Oct 2014 14:09:24 -0400