hasufell/ghc-mod
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix Cabal >= 1.18

Browse Source
This commit is contained in:
Daniel Gröber
2014-05-09 21:12:52 +02:00
parent 175635505d
commit 13930a9d7d
2 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Language/Haskell/GhcMod/GhcPkg.hs
View File

@@ -13,7 +13,7 @@ module Language.Haskell.GhcMod.GhcPkg (
import Config (cProjectVersionInt)
import Control.Applicative ((<$>))
#if MIN_VERSION_Cabal(1,18,0)
import Control.Exception (SomeException(..))
import qualified Control.Exception as E
#endif
import Data.Char (isSpace)
import Data.List (isPrefixOf, intercalate)
@@ -54,7 +54,7 @@ getPackageDbStack :: FilePath -- ^ Project Directory (where the
#if MIN_VERSION_Cabal(1,18,0)
getPackageDbStack cdir =
(getSandboxDb cdir >>= \db -> return [GlobalDb, PackageDb db])
`E.catch` \(_ :: SomeException) -> return [GlobalDb, UserDb]
`E.catch` \(_ :: E.SomeException) -> return [GlobalDb, UserDb]
#else
getPackageDbStack _ =
return [GlobalDb, UserDb]