haskell-nix/hnix-store
1
1
Fork 0
mirror of https://github.com/haskell-nix/hnix-store.git synced 2024-11-26 11:42:14 +03:00
Code Issues Projects Releases Wiki Activity

nar: throw error if there are collisions during unpacking

Browse Source
This commit is contained in:
Sander 2024-10-04 18:26:21 +04:00
parent d35aa18e34
commit 67ea0d05b6
No known key found for this signature in database
GPG Key ID: D1A763BC84F34603
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hnix-store-nar/src/System/Nix/Nar/Streamer.hs
View File

@ -99,7 +99,10 @@ streamNarIOWithOptions opts effs basePath yield = do
if Nar.optUseCaseHack opts if Nar.optUseCaseHack opts
then undoCaseHack f then undoCaseHack f
else f else f
in Map.insert name f acc in
case Map.insertLookupWithKey (\_ n _ -> n) name f acc of
(Nothing, newMap) -> newMap
(Just conflict, _) -> error $ "File name collision between " ++ (path </> name) ++ " and " ++ (path </> conflict)
) Map.empty fs ) Map.empty fs
yield $ strs ["type", "directory"] yield $ strs ["type", "directory"]
forM_ (Map.toAscList entries) $ \(unhacked, original) -> do forM_ (Map.toAscList entries) $ \(unhacked, original) -> do