diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2017-12-14 12:46:57 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2017-12-14 12:46:57 -0400 |
| commit | 3a0bd261d9cfd395ed23ff43515523e6c6658c33 (patch) | |
| tree | 9186c5daf386ba8e76c47ec869a737344a5a74d1 /Annex | |
| parent | ac4b4a812da85b46e7d656b12d9ff5568ef706fd (diff) | |
fold Build/SysConfig.hs into BuildInfo via include
This avoids warnings from stack about the module not being listed in the
cabal file. So, the generated file is also renamed to Build/SysConfig.
Note that the setup program seems to be cached despite these changes; I
had to cabal clean to get cabal to update it so that Build/SysConfig was
written.
This commit was sponsored by Jochen Bartl on Patreon.
Diffstat (limited to 'Annex')
| -rw-r--r-- | Annex/Ssh.hs | 4 | ||||
| -rw-r--r-- | Annex/Url.hs | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Annex/Ssh.hs b/Annex/Ssh.hs index e3d2c3d8b..5154a50a4 100644 --- a/Annex/Ssh.hs +++ b/Annex/Ssh.hs @@ -25,7 +25,7 @@ module Annex.Ssh ( import Annex.Common import Annex.LockFile -import qualified Build.SysConfig as SysConfig +import qualified BuildInfo import qualified Annex import qualified Git import qualified Git.Url @@ -138,7 +138,7 @@ sshConnectionCachingParams socketfile = - a different filesystem. -} sshCacheDir :: Annex (Maybe FilePath) sshCacheDir - | SysConfig.sshconnectioncaching = + | BuildInfo.sshconnectioncaching = ifM (fromMaybe True . annexSshCaching <$> Annex.getGitConfig) ( ifM crippledFileSystem ( maybe (return Nothing) usetmpdir =<< gettmpdir diff --git a/Annex/Url.hs b/Annex/Url.hs index f12408a08..f777a0ed0 100644 --- a/Annex/Url.hs +++ b/Annex/Url.hs @@ -16,10 +16,10 @@ module Annex.Url ( import Annex.Common import qualified Annex import Utility.Url as U -import qualified Build.SysConfig as SysConfig +import qualified BuildInfo defaultUserAgent :: U.UserAgent -defaultUserAgent = "git-annex/" ++ SysConfig.packageversion +defaultUserAgent = "git-annex/" ++ BuildInfo.packageversion getUserAgent :: Annex (Maybe U.UserAgent) getUserAgent = Annex.getState $ |