Allow exporttree remotes to be marked as dead.

Union with max so that DeadTrusted wins over UnTrusted.

This commit was sponsored by Trenton Cronholm on Patreon.

CHANGELOG

@@ -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
 

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 }

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]]