Merge pull request commercialhaskell#5104 from ppzzppz/stable

snoyberg · web-flow · commit 6da33ca4439b · 2020-01-07T06:38:09.000+02:00
fix "--resolver global " needs network
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -17,6 +17,9 @@ Other enhancements:
 
 Bug fixes:
 
+* `--resolver global` doesn't retrieve snapshots list from the internet
+   beause doesn't need it. See [#5103](https://github.com/commercialhaskell/stack/issues/5103)
+
 * Fix using relative links in haddocks output.  See
   [#4971](https://github.com/commercialhaskell/stack/issues/4971).
 * Do not include generated cabal file information in lock files. See
diff --git a/src/Stack/Config.hs b/src/Stack/Config.hs
@@ -146,7 +146,6 @@ makeConcreteResolver
     -> RIO env RawSnapshotLocation
 makeConcreteResolver (ARResolver r) = pure r
 makeConcreteResolver ar = do
-    snapshots <- getSnapshots
     r <-
         case ar of
             ARResolver r -> assert False $ makeConcreteResolver (ARResolver r)
@@ -157,16 +156,18 @@ makeConcreteResolver ar = do
                 iopc <- loadConfigYaml (parseProjectAndConfigMonoid (parent fp)) fp
                 ProjectAndConfigMonoid project _ <- liftIO iopc
                 return $ projectResolver project
-            ARLatestNightly -> return $ nightlySnapshotLocation $ snapshotsNightly snapshots
-            ARLatestLTSMajor x ->
+            ARLatestNightly -> nightlySnapshotLocation . snapshotsNightly <$> getSnapshots
+            ARLatestLTSMajor x -> do
+                snapshots <- getSnapshots
                 case IntMap.lookup x $ snapshotsLts snapshots of
                     Nothing -> throwString $ "No LTS release found with major version " ++ show x
                     Just y -> return $ ltsSnapshotLocation x y
-            ARLatestLTS
-                | IntMap.null $ snapshotsLts snapshots -> throwString "No LTS releases found"
-                | otherwise ->
-                    let (x, y) = IntMap.findMax $ snapshotsLts snapshots
-                     in return $ ltsSnapshotLocation x y
+            ARLatestLTS -> do
+                snapshots <- getSnapshots
+                if IntMap.null $ snapshotsLts snapshots
+                   then throwString "No LTS releases found"
+                   else let (x, y) = IntMap.findMax $ snapshotsLts snapshots
+                        in return $ ltsSnapshotLocation x y
     logInfo $ "Selected resolver: " <> display r
     return r
 
