Skip to content

Commit 7609e6e

Browse files
committed
loadBuildConfig: use getTerminal instead of hIsTerminalDevice
1 parent 1786c71 commit 7609e6e

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

src/Stack/Config.hs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ import Stack.Constants
6262
import qualified Stack.Docker as Docker
6363
import Stack.Init
6464
import Stack.Types
65+
import Stack.Types.Internal
6566
import System.Directory
6667
import System.Environment
6768
import System.IO
@@ -225,7 +226,7 @@ instance HasPlatform MiniConfig
225226

226227
-- | Load the configuration, using current directory, environment variables,
227228
-- and defaults as necessary.
228-
loadConfig :: (MonadLogger m,MonadIO m,MonadCatch m,MonadThrow m,MonadBaseControl IO m,MonadReader env m,HasHttpManager env)
229+
loadConfig :: (MonadLogger m,MonadIO m,MonadCatch m,MonadThrow m,MonadBaseControl IO m,MonadReader env m,HasHttpManager env,HasTerminal env)
229230
=> ConfigMonoid
230231
-- ^ Config monoid from parsed command-line arguments
231232
-> m (LoadConfig m)
@@ -248,7 +249,7 @@ loadConfig configArgs = do
248249

249250
-- | Load the build configuration, adds build-specific values to config loaded by @loadConfig@.
250251
-- values.
251-
loadBuildConfig :: (MonadLogger m, MonadIO m, MonadCatch m, MonadReader env m, HasHttpManager env, MonadBaseControl IO m)
252+
loadBuildConfig :: (MonadLogger m, MonadIO m, MonadCatch m, MonadReader env m, HasHttpManager env, MonadBaseControl IO m, HasTerminal env)
252253
=> EnvOverride
253254
-> Maybe (Project, Path Abs File, ConfigMonoid)
254255
-> Config
@@ -277,9 +278,8 @@ loadBuildConfig menv mproject config stackRoot mresolver noConfigStrat = do
277278
exists <- fileExists dest
278279
if exists
279280
then do
280-
inTerminal <- liftIO (hIsTerminalDevice stdout)
281281
ProjectAndConfigMonoid project _ <- loadYaml dest
282-
when inTerminal $ do
282+
when (getTerminal env) $
283283
case mresolver of
284284
Nothing ->
285285
$logInfo ("Using resolver: " <> renderResolver (projectResolver project) <>

0 commit comments

Comments
 (0)