From b928dc64041b7e3e19f7f8787cc1e38fb5b465ed Mon Sep 17 00:00:00 2001
From: Joey Hess <joeyh@joeyh.name>
Date: Tue, 5 Dec 2017 13:46:55 -0400
Subject: 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.
---
 Logs/Trust.hs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Logs')

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 }
-- 
cgit v1.2.3