Use globaldb path for querying Cabal version #1647

Author: mgsloan

src/Stack/GhcPkg.hs

@@ -160,12 +160,12 @@ unregisterGhcPkgId menv wc cv pkgDb gid ident = do
 
 -- | Get the version of Cabal from the global package database.
 getCabalPkgVer :: (MonadThrow m, MonadIO m, MonadLogger m, MonadBaseControl IO m, MonadCatch m)
-               => EnvOverride -> WhichCompiler -> m Version
-getCabalPkgVer menv wc =
+               => EnvOverride -> WhichCompiler -> Path Abs Dir -> m Version
+getCabalPkgVer menv wc pkgdb =
     findGhcPkgVersion
         menv
         wc
-        [] -- global DB
+        [pkgdb] -- global DB
         cabalPackageName >>=
         maybe (throwM $ Couldn'tFindPkgId cabalPackageName) return
 

src/Stack/Setup.hs

@@ -218,7 +218,8 @@ setupEnv mResolveMissingGHC = do
 
     menv <- mkEnvOverride platform env
     compilerVer <- getCompilerVersion menv wc
-    cabalVer <- getCabalPkgVer menv wc
+    globaldb <- getGlobalDB menv wc
+    cabalVer <- getCabalPkgVer menv wc globaldb
     packages <- mapM
         (resolvePackageEntry menv (bcRoot bconfig))
         (bcPackageEntries bconfig)
@@ -240,7 +241,6 @@ setupEnv mResolveMissingGHC = do
     createDatabase menv wc deps
     localdb <- runReaderT packageDatabaseLocal envConfig0
     createDatabase menv wc localdb
-    globaldb <- getGlobalDB menv wc
     extras <- runReaderT packageDatabaseExtra envConfig0
     let mkGPP locals = mkGhcPackagePath locals localdb deps extras globaldb
 
@@ -483,7 +483,8 @@ upgradeCabal menv wc = do
             [PackageIdentifier name' version]
                 | name == name' -> return version
             x -> error $ "Unexpected results for resolvePackages: " ++ show x
-    installed <- getCabalPkgVer menv wc
+    globaldb <- getGlobalDB menv wc
+    installed <- getCabalPkgVer menv wc globaldb
     if installed >= newest
         then $logInfo $ T.concat
             [ "Currently installed Cabal is "