Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Glasgow Haskell Compiler
Packages
Cabal
Commits
cd817001
Commit
cd817001
authored
Jun 25, 2014
by
Mikhail Glushenkov
Browse files
Use 'equalFilePath' instead of '/='.
parent
78ccb906
Changes
1
Show whitespace changes
Inline
Side-by-side
cabal-install/Distribution/Client/Install.hs
View file @
cd817001
...
...
@@ -50,7 +50,7 @@ import System.Directory
(
getTemporaryDirectory
,
doesDirectoryExist
,
doesFileExist
,
createDirectoryIfMissing
,
removeFile
,
renameDirectory
)
import
System.FilePath
(
(
</>
),
(
<.>
),
takeDirectory
)
(
(
</>
),
(
<.>
),
equalFilePath
,
takeDirectory
)
import
System.IO
(
openFile
,
IOMode
(
AppendMode
),
hClose
)
import
System.IO.Error
...
...
@@ -1191,7 +1191,8 @@ installLocalTarballPackage verbosity jobLimit pkgid
distDirPathTmp
=
absUnpackedPath
</>
(
defaultDistPref
++
"-tmp"
)
distDirPathNew
=
absUnpackedPath
</>
distPref
distDirExists
<-
doesDirectoryExist
distDirPath
when
(
distDirExists
&&
distDirPath
/=
distDirPathNew
)
$
do
when
(
distDirExists
&&
(
not
$
distDirPath
`
equalFilePath
`
distDirPathNew
))
$
do
-- NB: we need to handle the case when 'distDirPathNew' is a
-- subdirectory of 'distDirPath' (e.g. the former is
-- 'dist/dist-sandbox-3688fbc2' and the latter is 'dist').
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment