[commit: packages/Cabal] ghc-head: Make newly-added add-source deps override previously installed versions. (e8742a5)
git at git.haskell.org
git at git.haskell.org
Mon Aug 26 23:25:31 CEST 2013
Repository : ssh://git@git.haskell.org/Cabal
On branch : ghc-head
Link : http://git.haskell.org/?p=packages/Cabal.git;a=commit;h=e8742a5cc477318aeb6dd3046d0dd239b0447e4a
>---------------------------------------------------------------
commit e8742a5cc477318aeb6dd3046d0dd239b0447e4a
Author: Mikhail Glushenkov <mikhail.glushenkov at gmail.com>
Date: Fri May 17 17:51:34 2013 +0200
Make newly-added add-source deps override previously installed versions.
Fixes #1197.
This patch is a bit large because it includes several related changes:
1) Remove 'installUseSandbox' from 'InstallFlags' and pass 'useSandbox' as an
additional argument instead.
2) Instead of calling 'reinstallAddSourceDeps' from 'installAction', always pass
'SandboxPackageInfo' to 'install'.
3) Set the timestamps of newly-added add-source deps to 0 in the timestamp file.
4) Move the timestamp file update to 'postInstallActions' from
'withModifiedDeps'. This way, the timestamps are updated even when the user runs
'install --only-dependencies' or 'install some-add-source-dep-package-id'.
>---------------------------------------------------------------
e8742a5cc477318aeb6dd3046d0dd239b0447e4a
cabal-install/Distribution/Client/Dependency.hs | 2 +-
cabal-install/Distribution/Client/Install.hs | 50 ++++--
cabal-install/Distribution/Client/Sandbox.hs | 167 ++++++++++++--------
.../Distribution/Client/Sandbox/Timestamp.hs | 68 ++++----
cabal-install/Distribution/Client/Sandbox/Types.hs | 6 +-
cabal-install/Distribution/Client/Setup.hs | 14 +-
cabal-install/Main.hs | 45 +++---
7 files changed, 207 insertions(+), 145 deletions(-)
Diff suppressed because of size. To see it, use:
git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc e8742a5cc477318aeb6dd3046d0dd239b0447e4a
More information about the ghc-commits
mailing list