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

fix implicit embedcreds regression

Browse source 
Fix bug that made creds not be stored in git when a special remote was
initialized with gpg encryption, but without an explicit embedcreds=yes.

(Yet nother regression introduced in version 7.20200202.7. 5th so far.)
This commit is contained in:
Joey Hess 2020-06-16 17:59:55 -04:00
parent a1d4c8e4ec
commit ad81feb053
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
7 changed files with 32 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Remote/S3.hs
View file

@ -87,10 +87,10 @@ remote = specialRemoteType $ RemoteType
(FieldDesc "storage class, eg STANDARD or STANDARD_IA or ONEZONE_IA")
, optionalStringParser fileprefixField
(FieldDesc "prefix to add to filenames in the bucket")
, yesNoParser versioningField False
, yesNoParser versioningField (Just False)
(FieldDesc "enable versioning of bucket content")
, yesNoParser publicField False
(FieldDesc "allow public read access to the buckey")
, yesNoParser publicField (Just False)
(FieldDesc "allow public read access to the bucket")
, optionalStringParser publicurlField
(FieldDesc "url that can be used by public to download files")
, optionalStringParser protocolField
@ -157,7 +157,7 @@ newtype SignatureVersion = SignatureVersion Int
signatureVersionParser :: RemoteConfigField -> FieldDesc -> RemoteConfigFieldParser
signatureVersionParser f fd =
genParser go f defver fd
genParser go f (Just defver) fd
(Just (ValueDesc "v2 or v4"))
where
go "v2" = Just (SignatureVersion 2)