@@ -34,7 +34,6 @@ checkUploads allowedFP newAllowedFP = do
3434 _ <- evaluate $ msize forbidden
3535
3636 unless (Map.null $ unMonoidMap allowed') $ do
37− let fp = "new-allowed.txt"
3837 putStrLn $ "Newly uploaded packages detected, writing to " ++ newAllowedFP
3938 writeAllowed newAllowedFP allowed'
4039
@@ -47,9 +46,16 @@ instance (Ord k, Monoid v) => Monoid (MonoidMap k v) where
4746 MonoidMap x `mappend` MonoidMap y = MonoidMap $ Map.unionWith mappend x y
4847
4948-- And some helper functions.
49+mlookup :: Ord k => k -> MonoidMap k v -> Maybe v
5050mlookup k = Map.lookup k . unMonoidMap
51+
52+msingleton :: k -> v -> MonoidMap k v
5153msingleton k = MonoidMap . Map.singleton k
54+
55+mkeys :: MonoidMap k v -> [k]
5256mkeys = Map.keys . unMonoidMap
57+
58+msize :: MonoidMap k v -> Int
5359msize = Map.size . unMonoidMap
5460
5561type Version = String
@@ -106,7 +112,7 @@ updateAllowed uploads allowed =
106112 go pkg =
107113 case (mlookup pkg uploads, mlookup pkg allowed) of
108114 (Nothing, Nothing) -> assert False (mempty, mempty)
109− (Nothing, Just a) -> (mempty, mempty)
115+ (Nothing, Just _) -> (mempty, mempty)
110116 (Just u, Nothing) -> (msingleton pkg $ getAllUsers u, mempty)
111117 (Just u, Just a) ->
112118 let fval = mconcat $ map (check a) $ Map.toList u
@@ -119,8 +125,8 @@ updateAllowed uploads allowed =
119125 getAllUsers = Set.fromList . map fst . Map.elems
120126
121127 check :: Set UserName -> (Version, (UserName, UTCTime)) -> Map Version (UserName, UTCTime)
122− check allowed (ver, (user, time))
123− | user `Set.member` allowed = Map.empty
128+ check allowed' (ver, (user, time))
129+ | user `Set.member` allowed' = Map.empty
124130 | otherwise = Map.singleton ver (user, time)
125131
126132writeAllowed :: FilePath -> Allowed -> IO ()