diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-03-21 21:21:20 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-03-21 21:21:20 -0400 |
| commit | 181d2ccd20a41b1785569acb3efb76deb8cbdf00 (patch) | |
| tree | 3bcd69b2c31c3e4a1f428b906e58d61492c66c96 /configure.hs | |
| parent | d2283777226d0e386a288ff224c71ce6ed2c1a0b (diff) | |
Improve detection of inability to check free disk space.
Don't check if configure indicated checks won't work. This should fix a
FTBFS on mipsel, where configure correctly detects the checks won't work,
while garbage is returned for disk space info at git-annex runtime. It also
means that, when built via cabal, disk space checks are not enabled,
unfortunatly.
Diffstat (limited to 'configure.hs')
| -rw-r--r-- | configure.hs | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/configure.hs b/configure.hs index 3fb0671e7..6fdc5fcb0 100644 --- a/configure.hs +++ b/configure.hs @@ -8,14 +8,16 @@ import Utility.StatFS tests :: [TestCase] tests = [ TestCase "StatFS" testStatFS - ] ++ Configure.tests + ] ++ Configure.tests False {- This test cannot be included in Build.Configure due to needing - - Utility/StatFS.hs to be built. -} + - Utility/StatFS.hs to be built, which it is not when "cabal configure" + - is run. -} testStatFS :: Test testStatFS = do s <- getFileSystemStats "." - return $ Config "statfs_sane" $ BoolConfig $ isJust s + return $ Config "statfs_sanity_checked" $ + MaybeBoolConfig $ Just $ isJust s main :: IO () main = Configure.run tests |