fix inverted Ord for TrustLevel (intermediate commit)

This commit removes the Ord and Enum instances, commenting out all code
that depends on them, to make sure that all code effected by the
inversion fix has been identified.

(Assuming no ifdefs involve TrustLevel.)

The next commit will fix up all the identified code.
This commit is contained in:
Joey Hess 2018-04-13 14:50:14 -04:00
parent 1831cc4a7d
commit a0e4b9678b
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
7 changed files with 16 additions and 13 deletions

View file

@ -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 max exportoverrides $
M.union overrides $
M.union configured logged
Annex.changeState $ \s -> s { Annex.trustmap = Just m }

View file

@ -31,6 +31,6 @@ showTrustLog DeadTrusted = "X"
showTrustLog SemiTrusted = "?"
prop_parse_show_TrustLog :: Bool
prop_parse_show_TrustLog = all check [minBound .. maxBound]
prop_parse_show_TrustLog = True -- all check [minBound .. maxBound]
where
check l = parseTrustLog (showTrustLog l) == l