mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

fix windows code again (argh)

Browse source
This commit is contained in:
Joey Hess 2014-02-06 17:41:46 -04:00
parent 43d17632f6
commit 810b26e1d9
1 changed files with 1 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Utility/Path.hs
View file

@ -42,7 +42,7 @@ absNormPath :: FilePath -> FilePath -> Maybe FilePath
#ifndef mingw32_HOST_OS #ifndef mingw32_HOST_OS
absNormPath dir path = MissingH.absNormPath dir path absNormPath dir path = MissingH.absNormPath dir path
#else #else
absNormPath dir path = MissingH.absNormPath dir path absNormPath dir path = Just $ combine dir path
#endif #endif
{- On Windows, this converts the paths to unix-style, in order to run {- On Windows, this converts the paths to unix-style, in order to run
@ -50,7 +50,6 @@ absNormPath dir path = MissingH.absNormPath dir path
#ifndef mingw32_HOST_OS #ifndef mingw32_HOST_OS
absNormPathUnix dir path = MissingH.absNormPath dir path absNormPathUnix dir path = MissingH.absNormPath dir path
#else #else
absNormPathUnix dir path = Just $ combine dir path
absNormPathUnix dir path = MissingH.absNormPath (fromdos dir) (fromdos path) absNormPathUnix dir path = MissingH.absNormPath (fromdos dir) (fromdos path)
where where
fromdos = replace "\\" "/" fromdos = replace "\\" "/"