From c10be2dbaf3c3a4137b15ffa582126543b783e44 Mon Sep 17 00:00:00 2001 From: simonmar Date: Thu, 11 Nov 2004 17:25:59 +0000 Subject: [PATCH] [project @ 2004-11-11 17:25:59 by simonmar] Restore compatibility with GHC 6.2 --- ghc/utils/ghc-pkg/Main.hs | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/ghc/utils/ghc-pkg/Main.hs b/ghc/utils/ghc-pkg/Main.hs index 81c0a57..572ecdb 100644 --- a/ghc/utils/ghc-pkg/Main.hs +++ b/ghc/utils/ghc-pkg/Main.hs @@ -23,9 +23,10 @@ import Distribution.Package import Distribution.License import Distribution.Version import Compat.Directory ( getAppUserDataDirectory ) -import Control.Exception ( catch, throw, evaluate ) +import Control.Exception ( evaluate ) +import qualified Control.Exception as Exception -import Prelude hiding ( catch ) +import Prelude import Package -- the old package config type @@ -50,7 +51,7 @@ import System ( getEnv, getArgs, getProgName, system, exitWith, ExitCode(..) ) -import IO hiding ( catch ) +import IO import List ( isPrefixOf, isSuffixOf ) import ParsePkgConfLite @@ -288,7 +289,8 @@ readParseDatabase filename = do str <- readFile filename let packages = read str evaluate packages - `catch` \_ -> die (filename ++ ": parse error in package config file\n") + `Exception.catch` \_ -> + die (filename ++ ": parse error in package config file\n") return (filename,packages) emptyPackageConfig :: String @@ -339,7 +341,7 @@ parsePackageInfo str defines force = Right ok -> return ok Left err -> do old_pkg <- evaluate (parseOnePackageConfig str) - `catch` \_ -> parse_failed + `Exception.catch` \_ -> parse_failed putStr "Expanding embedded variables... " new_old_pkg <- expandEnvVars old_pkg defines force return (convertOldPackage old_pkg) @@ -505,7 +507,7 @@ maybeRestoreOldConfig filename io "restore the old configuration... ") renameFile (filename ++ ".old") filename hPutStrLn stdout "done." - throw e + ioError e writeNewConfig :: FilePath -> [InstalledPackageInfo] -> IO () writeNewConfig filename packages = do -- 1.7.10.4