[commit: packages/Cabal] ghc-head: Revert the timestamp checks back to (>=) from (>). (e1aad95)
git at git.haskell.org
git at git.haskell.org
Mon Aug 26 23:23:02 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=e1aad95fae742d6385786423efd462fb5432d670
>---------------------------------------------------------------
commit e1aad95fae742d6385786423efd462fb5432d670
Author: Mikhail Glushenkov <the.dead.shall.rise at gmail.com>
Date: Mon Apr 29 21:53:10 2013 +0200
Revert the timestamp checks back to (>=) from (>).
>---------------------------------------------------------------
e1aad95fae742d6385786423efd462fb5432d670
cabal-install/Distribution/Client/IndexUtils.hs | 3 +--
cabal-install/Distribution/Client/Sandbox/Timestamp.hs | 3 +--
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/cabal-install/Distribution/Client/IndexUtils.hs b/cabal-install/Distribution/Client/IndexUtils.hs
index 4b81ae5..ea8d777 100644
--- a/cabal-install/Distribution/Client/IndexUtils.hs
+++ b/cabal-install/Distribution/Client/IndexUtils.hs
@@ -240,8 +240,7 @@ whenCacheOutOfDate origFile cacheFile action = do
else do
origTime <- getModificationTime origFile
cacheTime <- getModificationTime cacheFile
- -- FIXME: Revert back to >= when we'll add finer-resolution mtime utils.
- unless (cacheTime > origTime) action
+ unless (cacheTime >= origTime) action
------------------------------------------------------------------------
diff --git a/cabal-install/Distribution/Client/Sandbox/Timestamp.hs b/cabal-install/Distribution/Client/Sandbox/Timestamp.hs
index a9b6b3c..5e76989 100644
--- a/cabal-install/Distribution/Client/Sandbox/Timestamp.hs
+++ b/cabal-install/Distribution/Client/Sandbox/Timestamp.hs
@@ -269,8 +269,7 @@ isDepModified verbosity now (packageDir, timestamp) = do
when (modTime > now) $
warn verbosity $ "File '" ++ dep
++ "' has a modification time that is in the future."
- -- FIXME: Revert back to >= when we'll add finer-resolution mtime utils.
- if modTime > timestamp
+ if modTime >= timestamp
then do
debug verbosity ("Dependency has a modified source file: " ++ dep)
return True
More information about the ghc-commits
mailing list