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
086a62e8
Commit
086a62e8
authored
Jun 25, 2014
by
Neil Vice
Committed by
tibbe
Jun 24, 2014
Browse files
Don't attempt to rename dist if it is already named correctly
(cherry picked from commit
e0c9fec8
)
parent
a46df9db
Changes
1
Hide whitespace changes
Inline
Side-by-side
cabal-install/Distribution/Client/Install.hs
View file @
086a62e8
...
@@ -1190,7 +1190,7 @@ installLocalTarballPackage verbosity jobLimit pkgid
...
@@ -1190,7 +1190,7 @@ installLocalTarballPackage verbosity jobLimit pkgid
distDirPathTmp
=
absUnpackedPath
</>
(
defaultDistPref
++
"-tmp"
)
distDirPathTmp
=
absUnpackedPath
</>
(
defaultDistPref
++
"-tmp"
)
distDirPathNew
=
absUnpackedPath
</>
distPref
distDirPathNew
=
absUnpackedPath
</>
distPref
distDirExists
<-
doesDirectoryExist
distDirPath
distDirExists
<-
doesDirectoryExist
distDirPath
when
distDirExists
$
do
when
(
distDirExists
&&
distDirPath
/=
distDirPathNew
)
$
do
-- NB: we need to handle the case when 'distDirPathNew' is a
-- NB: we need to handle the case when 'distDirPathNew' is a
-- subdirectory of 'distDirPath' (e.g. 'dist/dist-sandbox-3688fbc2').
-- subdirectory of 'distDirPath' (e.g. 'dist/dist-sandbox-3688fbc2').
debug
verbosity
$
"Renaming '"
++
distDirPath
++
"' to '"
debug
verbosity
$
"Renaming '"
++
distDirPath
++
"' to '"
...
...
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