From 21d30cd8ce997bac559797064d5e54e3b5813788 Mon Sep 17 00:00:00 2001 From: Julian Ospald Date: Wed, 28 Jul 2021 22:48:28 +0200 Subject: [PATCH] Fix GHCup showing up twice in list --- lib/GHCup.hs | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/lib/GHCup.hs b/lib/GHCup.hs index 8b59840..591f344 100644 --- a/lib/GHCup.hs +++ b/lib/GHCup.hs @@ -1187,18 +1187,18 @@ listVersions lt' criteria = do latestVer = fst <$> headOf (getTagged Latest) av recommendedVer = fst <$> headOf (getTagged Latest) av isOld = maybe True (> currentVer) latestVer && maybe True (> currentVer) recommendedVer - in if | currentVer == listVer -> Nothing - | otherwise -> ListResult { lVer = currentVer - , lTag = maybe (if isOld then [Old] else []) _viTags listVer - , lCross = Nothing - , lTool = GHCup - , fromSrc = False - , lStray = isNothing listVer - , lSet = True - , lInstalled = True - , lNoBindist = False - , hlsPowered = False - } + in if | Map.member currentVer av -> Nothing + | otherwise -> Just $ ListResult { lVer = currentVer + , lTag = maybe (if isOld then [Old] else []) _viTags listVer + , lCross = Nothing + , lTool = GHCup + , fromSrc = False + , lStray = isNothing listVer + , lSet = True + , lInstalled = True + , lNoBindist = False + , hlsPowered = False + } -- NOTE: this are not cross ones, because no bindists toListResult :: ( MonadLogger m