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

Allow exporttree remotes to be marked as dead.

Browse source 
Union with max so that DeadTrusted wins over UnTrusted.

This commit was sponsored by Trenton Cronholm on Patreon.
This commit is contained in:
Joey Hess 2017-12-05 13:46:55 -04:00
parent 1f937ee840
commit 4e38c4f57f
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
3 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG
View file

@ -10,6 +10,7 @@ git-annex (6.20171125) UNRELEASED; urgency=medium
* importfeed now downloads things linked to by feeds, even when they are * importfeed now downloads things linked to by feeds, even when they are
not media files. not media files.
* Removed no longer needed dependency on yesod-default. * Removed no longer needed dependency on yesod-default.
* Allow exporttree remotes to be marked as dead.
-- Joey Hess <id@joeyh.name> Tue, 28 Nov 2017 13:48:44 -0400 -- Joey Hess <id@joeyh.name> Tue, 28 Nov 2017 13:48:44 -0400

2
Logs/Trust.hs
View file

@ -72,7 +72,7 @@ trustMapLoad = do
map (\r -> (Types.Remote.uuid r, UnTrusted)) exports map (\r -> (Types.Remote.uuid r, UnTrusted)) exports
logged <- trustMapRaw logged <- trustMapRaw
let configured = M.fromList $ mapMaybe configuredtrust l let configured = M.fromList $ mapMaybe configuredtrust l
let m = M.union exportoverrides $ let m = M.unionWith max exportoverrides $
M.union overrides $ M.union overrides $
M.union configured logged M.union configured logged
Annex.changeState $ \s -> s { Annex.trustmap = Just m } Annex.changeState $ \s -> s { Annex.trustmap = Just m }

2
doc/todo/Add_a_way_to_mark_exporttree_remotes_dead.mdwn
View file

@ -6,3 +6,5 @@ There is currently no way to get rid of an exporttree remote, because the trust
This remote's trust level is overridden to untrusted. This remote's trust level is overridden to untrusted.
ok ok
(recording state in git...) (recording state in git...)
> Fun bug! I've fixed it so that will work. [[done]] --[[Joey]]