cabal-install/IndexUtils : Expose function getIndexFileAge.

* The function has type 'Repo -> IO Double'.
* It returns the age in days as a Double.
* Places that expected the age as an Int have been updated.
* Builds with ghc 7.4.2 and 7.8.3.

cabal-install/Distribution/Client/Compat/Time.hs

@@ -11,7 +11,7 @@ import Data.Time.Clock.POSIX (utcTimeToPOSIXSeconds, posixDayLength)
 import Data.Time (getCurrentTime, diffUTCTime)
 #else
 import System.Time (ClockTime(..), getClockTime
-                   ,diffClockTimes, normalizeTimeDiff, tdDay)
+                   ,diffClockTimes, normalizeTimeDiff, tdDay, tdHour)
 #endif
 
 #if defined mingw32_HOST_OS
@@ -115,17 +115,17 @@ getModTime path = do
 #endif
 
 -- | Return age of given file in days.
-getFileAge :: FilePath -> IO Int
+getFileAge :: FilePath -> IO Double
 getFileAge file = do
   t0 <- getModificationTime file
 #if MIN_VERSION_directory(1,2,0)
   t1 <- getCurrentTime
-  let days = truncate $ (t1 `diffUTCTime` t0) / posixDayLength
+  return $ realToFrac (t1 `diffUTCTime` t0) / realToFrac posixDayLength
 #else
   t1 <- getClockTime
-  let days = (tdDay . normalizeTimeDiff) (t1 `diffClockTimes` t0)
+  let dt = normalizeTimeDiff (t1 `diffClockTimes` t0)
+  return $ fromIntegral ((24 * tdDay dt) + tdHour dt) / 24.0
 #endif
-  return days
 
 getCurTime :: IO EpochTime
 getCurTime =  do

cabal-install/Distribution/Client/IndexUtils.hs

@@ -11,6 +11,7 @@
 -- Extra utils related to the package indexes.
 -----------------------------------------------------------------------------
 module Distribution.Client.IndexUtils (
+  getIndexFileAge,
   getInstalledPackages,
   getSourcePackages,
   getSourcePackagesStrict,
@@ -180,7 +181,7 @@ readRepoIndex verbosity repo mode =
   let indexFile = repoLocalDir repo </> "00-index.tar"
       cacheFile = repoLocalDir repo </> "00-index.cache"
   in handleNotFound $ do
-    warnIfIndexIsOld indexFile
+    warnIfIndexIsOld =<< getIndexFileAge repo
     whenCacheOutOfDate indexFile cacheFile $ do
       info verbosity "Updating the index cache file..."
       updatePackageIndexCacheFile indexFile cacheFile
@@ -214,8 +215,7 @@ readRepoIndex verbosity repo mode =
       else ioError e
 
     isOldThreshold = 15 --days
-    warnIfIndexIsOld indexFile = do
-      dt <- getFileAge indexFile
+    warnIfIndexIsOld dt = do
       when (dt >= isOldThreshold) $ case repoKind repo of
         Left  remoteRepo -> warn verbosity $
              "The package list for '" ++ remoteRepoName remoteRepo
@@ -223,6 +223,12 @@ readRepoIndex verbosity repo mode =
           ++ "'cabal update' to get the latest list of available packages."
         Right _localRepo -> return ()
 
+
+-- | Return the age of the index file in days (as a Double).
+getIndexFileAge :: Repo -> IO Double
+getIndexFileAge repo = getFileAge $ repoLocalDir repo </> "00-index.tar"
+
+
 -- | It is not necessary to call this, as the cache will be updated when the
 -- index is read normally. However you can do the work earlier if you like.
 --