summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2014-02-10 18:30:04 -0400
committerGravatar Joey Hess <joey@kitenet.net>2014-02-10 18:30:04 -0400
commit4ab748a9f3cc446f566c9328ef5873a4211075be (patch)
treed29273dd75fb39aa9d074e2b939cf6668a791ae1
parentce1440413cb1d3b206e66d66f2581719cab3cf28 (diff)
parent662f54e15a5e2569d49a54b45ffc22e2e45593f7 (diff)
Merge branch 'master' of ssh://git-annex.branchable.com
-rw-r--r--Build/DistributionUpdate.hs5
1 files changed, 3 insertions, 2 deletions
diff --git a/Build/DistributionUpdate.hs b/Build/DistributionUpdate.hs
index ba0e9844a..2c4d82495 100644
--- a/Build/DistributionUpdate.hs
+++ b/Build/DistributionUpdate.hs
@@ -25,7 +25,7 @@ makeinfos = do
version <- liftIO getChangelogVersion
now <- liftIO getCurrentTime
liftIO $ putStrLn $ "building info files for version " ++ version ++ " in " ++ basedir
- fs <- liftIO $ dirContentsRecursiveSkipping (== "info") True (basedir </> "git-annex")
+ fs <- liftIO $ dirContentsRecursiveSkipping (const False) True (basedir </> "git-annex")
forM_ fs $ \f -> do
v <- lookupFile f
case v of
@@ -56,7 +56,8 @@ makeinfos = do
]
{- Check for out of date info files. -}
- infos <- liftIO $ dirContentsRecursiveSkipping (/= "info") True (basedir </> "git-annex")
+ infos <- liftIO $ filter (".info" `isSuffixOf`)
+ <$> dirContentsRecursive (basedir </> "git-annex")
ds <- liftIO $ forM infos (readish <$$> readFile)
let dis = zip infos ds
let ood = filter (outofdate version) dis