diff options
| author | Joey Hess <joeyh@joeyh.name> | 2018-04-13 15:16:07 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2018-04-13 15:17:54 -0400 |
| commit | f56594af9e6ec2d726b98d7bb16fb8c9382ecde4 (patch) | |
| tree | 1b0a831447e3f8797566f67119f473ac6420a19a /Logs | |
| parent | a0e4b9678b227b1ad4c24fc13b5e7619311187f5 (diff) | |
finish fixing inverted Ord for TrustLevel
Flipped all comparisons. When a TrustLevel list was wanted from Trusted
downwards, used Down to compare it in that order.
This commit was sponsored by mo on Patreon.
Diffstat (limited to 'Logs')
| -rw-r--r-- | Logs/Trust.hs | 2 | ||||
| -rw-r--r-- | Logs/Trust/Pure.hs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Logs/Trust.hs b/Logs/Trust.hs index 95843c882e..706140b65c 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.unionWith max exportoverrides $ + let m = M.unionWith min exportoverrides $ M.union overrides $ M.union configured logged Annex.changeState $ \s -> s { Annex.trustmap = Just m } diff --git a/Logs/Trust/Pure.hs b/Logs/Trust/Pure.hs index e67583b568..74b7fd38cb 100644 --- a/Logs/Trust/Pure.hs +++ b/Logs/Trust/Pure.hs @@ -31,6 +31,6 @@ showTrustLog DeadTrusted = "X" showTrustLog SemiTrusted = "?" prop_parse_show_TrustLog :: Bool -prop_parse_show_TrustLog = True -- all check [minBound .. maxBound] +prop_parse_show_TrustLog = all check [minBound .. maxBound] where check l = parseTrustLog (showTrustLog l) == l |