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

fix json for exportedtrees in conflict

Browse source 
Repeating the same json field with multiple values tends to not be
supported well by json parsers, so list the trees separated by spaces.
This commit is contained in:
Joey Hess 2018-12-03 14:43:59 -04:00
parent b71d62b1aa
commit a25fef36ad
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Remote/Helper/Export.hs
View file

@ -188,11 +188,10 @@ adjustExportable r = case M.lookup "exporttree" (config r) of
, checkPresentCheap = False
, mkUnavailable = return Nothing
, getInfo = do
ts <- map (\t -> ("exportedtree", fromRef t) )
. map exportedTreeish
ts <- map (fromRef . exportedTreeish)
<$> getExport (uuid r)
is <- getInfo r
return (is++[("export", "yes")]++ts)
return (is++[("export", "yes"), ("exportedtree", unwords ts)])
}
retrieveKeyFileFromExport getexportlocs exportinconflict k _af dest p = unVerified $
if maybe False (isJust . verifyKeyContent) (maybeLookupBackendVariety (keyVariety k))