git.iko.soy/stackage
on master help sign in
Fix some path names for Windows #195
622c2b8Michael Snoyman
Stackage/LoadDatabase.hs+4−1
compare with master
unifiedsplit
@@ -123,6 +123,9 @@ loadPackageDB settings coreMap core deps = do
123 findCabalAndAddPackage tarball p v pdb =
123 findCabalAndAddPackage tarball p v pdb =
124 loop
124 loop
125 where
125 where
126+ fixPath '\\' = '/'
127+ fixPath c = c
128+
126 expectedPath = let PackageName p' = p in concat
129 expectedPath = let PackageName p' = p in concat
127 [ packageVersionString (p, v)
130 [ packageVersionString (p, v)
128 , "/"
131 , "/"
@@ -142,7 +145,7 @@ loadPackageDB settings coreMap core deps = do
142 , show e
145 , show e
143 ]
146 ]
144 loop (Tar.Next entry rest)
147 loop (Tar.Next entry rest)
145− | Tar.entryPath entry == expectedPath =
148+ | map fixPath (Tar.entryPath entry) == expectedPath =
146 case Tar.entryContent entry of
149 case Tar.entryContent entry of
147 Tar.NormalFile bs _ -> addPackage p v bs pdb
150 Tar.NormalFile bs _ -> addPackage p v bs pdb
148 _ -> error $ concat
151 _ -> error $ concat