mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

allow annex.expireunused to be set to false, as well as to a duration

Browse source
This commit is contained in:
Joey Hess 2014-01-22 23:10:51 -04:00
parent ee5bb374bb
commit 489972c035
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Assistant/Threads/SanityChecker.hs
View file

@ -232,7 +232,8 @@ oneDay = 24 * oneHour
checkOldUnused :: UrlRenderer -> Assistant () checkOldUnused :: UrlRenderer -> Assistant ()
checkOldUnused urlrenderer = go =<< annexExpireUnused <$> liftAnnex Annex.getGitConfig checkOldUnused urlrenderer = go =<< annexExpireUnused <$> liftAnnex Annex.getGitConfig
where where
go (Just expireunused) = do go (Just Nothing) = noop
go (Just (Just expireunused)) = do
m <- liftAnnex $ readUnusedLog "" m <- liftAnnex $ readUnusedLog ""
now <- liftIO getPOSIXTime now <- liftIO getPOSIXTime
let duration = durationToPOSIXTime expireunused let duration = durationToPOSIXTime expireunused

5
Types/GitConfig.hs
View file

@ -47,7 +47,7 @@ data GitConfig = GitConfig
, annexLargeFiles :: Maybe String , annexLargeFiles :: Maybe String
, annexFsckNudge :: Bool , annexFsckNudge :: Bool
, annexAutoUpgrade :: AutoUpgrade , annexAutoUpgrade :: AutoUpgrade
, annexExpireUnused :: Maybe Duration , annexExpireUnused :: Maybe (Maybe Duration)
, coreSymlinks :: Bool , coreSymlinks :: Bool
, gcryptId :: Maybe String , gcryptId :: Maybe String
} }
@ -77,7 +77,8 @@ extractGitConfig r = GitConfig
, annexLargeFiles = getmaybe (annex "largefiles") , annexLargeFiles = getmaybe (annex "largefiles")
, annexFsckNudge = getbool (annex "fscknudge") True , annexFsckNudge = getbool (annex "fscknudge") True
, annexAutoUpgrade = toAutoUpgrade $ getmaybe (annex "autoupgrade") , annexAutoUpgrade = toAutoUpgrade $ getmaybe (annex "autoupgrade")
, annexExpireUnused = parseDuration =<< getmaybe (annex "expireunused") , annexExpireUnused = maybe Nothing Just . parseDuration
<$> getmaybe (annex "expireunused")
, coreSymlinks = getbool "core.symlinks" True , coreSymlinks = getbool "core.symlinks" True
, gcryptId = getmaybe "core.gcrypt-id" , gcryptId = getmaybe "core.gcrypt-id"
} }