diff options
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | Logs/Trust.hs | 2 | ||||
| -rw-r--r-- | doc/todo/Add_a_way_to_mark_exporttree_remotes_dead.mdwn | 2 |
3 files changed, 4 insertions, 1 deletions
@@ -10,6 +10,7 @@ git-annex (6.20171125) UNRELEASED; urgency=medium * importfeed now downloads things linked to by feeds, even when they are not media files. * 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 diff --git a/Logs/Trust.hs b/Logs/Trust.hs index 54cafc9f4..e68efc895 100644 --- a/Logs/Trust.hs +++ b/Logs/Trust.hs @@ -72,7 +72,7 @@ trustMapLoad = do map (\r -> (Types.Remote.uuid r, UnTrusted)) exports logged <- trustMapRaw let configured = M.fromList $ mapMaybe configuredtrust l - let m = M.union exportoverrides $ + let m = M.unionWith max exportoverrides $ M.union overrides $ M.union configured logged Annex.changeState $ \s -> s { Annex.trustmap = Just m } diff --git a/doc/todo/Add_a_way_to_mark_exporttree_remotes_dead.mdwn b/doc/todo/Add_a_way_to_mark_exporttree_remotes_dead.mdwn index eba133133..c534f59ba 100644 --- a/doc/todo/Add_a_way_to_mark_exporttree_remotes_dead.mdwn +++ b/doc/todo/Add_a_way_to_mark_exporttree_remotes_dead.mdwn @@ -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. ok (recording state in git...) + +> Fun bug! I've fixed it so that will work. [[done]] --[[Joey]] |