From 622c2b8c63b34983fba8ed2f96d124efb3f0cbe0 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Mon, 17 Mar 2014 07:18:43 -0700 Subject: [PATCH] Fix some path names for Windows #195 --- Stackage/LoadDatabase.hs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Stackage/LoadDatabase.hs b/Stackage/LoadDatabase.hs index d86d2e1e..d38306b3 100644 --- a/Stackage/LoadDatabase.hs +++ b/Stackage/LoadDatabase.hs @@ -123,6 +123,9 @@ loadPackageDB settings coreMap core deps = do findCabalAndAddPackage tarball p v pdb = loop where + fixPath '\\' = '/' + fixPath c = c + expectedPath = let PackageName p' = p in concat [ packageVersionString (p, v) , "/" @@ -142,7 +145,7 @@ loadPackageDB settings coreMap core deps = do , show e ] loop (Tar.Next entry rest) - | Tar.entryPath entry == expectedPath = + | map fixPath (Tar.entryPath entry) == expectedPath = case Tar.entryContent entry of Tar.NormalFile bs _ -> addPackage p v bs pdb _ -> error $ concat