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

include all remotes back in

Browse source
This commit is contained in:
Joey Hess 2019-12-02 12:26:33 -04:00
parent 1100e0d3c9
commit 650a631ef8
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
9 changed files with 31 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Remote/S3.hs
View file

@ -881,7 +881,8 @@ getBucketObject c = munge . serializeKey
_ -> getFilePrefix c ++ s
getBucketExportLocation :: RemoteConfig -> ExportLocation -> BucketObject
getBucketExportLocation c loc = getFilePrefix c ++ fromExportLocation loc
getBucketExportLocation c loc =
getFilePrefix c ++ fromRawFilePath (fromExportLocation loc)
getBucketImportLocation :: RemoteConfig -> BucketObject -> Maybe ImportLocation
getBucketImportLocation c obj
@ -889,7 +890,8 @@ getBucketImportLocation c obj
| obj == uuidfile = Nothing
-- Only import files that are under the fileprefix, when
-- one is configured.
| prefix `isPrefixOf` obj = Just $ mkImportLocation $ drop prefixlen obj
| prefix `isPrefixOf` obj = Just $ mkImportLocation $
toRawFilePath $ drop prefixlen obj
| otherwise = Nothing
where
prefix = getFilePrefix c