diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-10-30 19:28:46 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-10-30 19:28:46 -0400 |
| commit | ada8d0bebdb79b26f7168e0a77ee7ecf053bcf14 (patch) | |
| tree | a5d5556e8468701e8397c394c43aa2dcc7bbc318 | |
| parent | fdfcf16d8d2d2475bcf9cabed3f5cd2e7a2ac4a5 (diff) | |
don't test host in configure
That'll fail when building offline.
| -rw-r--r-- | Build/Configure.hs | 1 | ||||
| -rw-r--r-- | Utility/SRV.hs | 11 |
2 files changed, 4 insertions, 8 deletions
diff --git a/Build/Configure.hs b/Build/Configure.hs index 894feb409..96582f923 100644 --- a/Build/Configure.hs +++ b/Build/Configure.hs @@ -27,7 +27,6 @@ tests = , TestCase "bup" $ testCmd "bup" "bup --version >/dev/null" , TestCase "gpg" $ testCmd "gpg" "gpg --version >/dev/null" , TestCase "lsof" $ testCmd "lsof" "lsof -v >/dev/null 2>&1" - , TestCase "host" $ testCmd "host" "host localhost >/dev/null 2>&1" , TestCase "ssh connection caching" getSshConnectionCaching ] ++ shaTestCases [ (1, "da39a3ee5e6b4b0d3255bfef95601890afd80709") diff --git a/Utility/SRV.hs b/Utility/SRV.hs index c43782a56..5443b8b1a 100644 --- a/Utility/SRV.hs +++ b/Utility/SRV.hs @@ -16,7 +16,6 @@ module Utility.SRV ( lookupSRV, ) where -import qualified Build.SysConfig import Utility.Process import Utility.Exception import Utility.PartialPrelude @@ -86,12 +85,10 @@ lookupSRV = lookupSRVHost #endif lookupSRVHost :: SRV -> IO [HostPort] -lookupSRVHost (SRV srv) - | Build.SysConfig.host = catchDefaultIO [] $ - parseSrvHost <$> readProcessEnv "host" ["-t", "SRV", "--", srv] - -- clear environment, to avoid LANG affecting output - (Just []) - | otherwise = return [] +lookupSRVHost (SRV srv) = catchDefaultIO [] $ + parseSrvHost <$> readProcessEnv "host" ["-t", "SRV", "--", srv] + -- clear environment, to avoid LANG affecting output + (Just []) parseSrvHost :: String -> [HostPort] parseSrvHost = orderHosts . catMaybes . map parse . lines |