[commit: Cabal] master: Use catch from the Prelude in the auto generated Paths_pkgname module (47733f3)

[Ian Lynagh]

Repository : ssh://darcs.haskell.org//srv/darcs/packages/Cabal

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/47733f319dfce7c4168500d576760a117b8f0327

>---------------------------------------------------------------

commit 47733f319dfce7c4168500d576760a117b8f0327
Author: Bas van Dijk <v.dijk.bas at gmail.com>
Date:   Wed Mar 30 13:40:05 2011 +0000

    Use catch from the Prelude in the auto generated Paths_pkgname module
    This enables it to be build with GHC-6.8

>---------------------------------------------------------------

 Distribution/Simple/Build/PathsModule.hs |   10 +++-------
 1 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/Distribution/Simple/Build/PathsModule.hs b/Distribution/Simple/Build/PathsModule.hs
index eec847d..0d266bf 100644
--- a/Distribution/Simple/Build/PathsModule.hs
+++ b/Distribution/Simple/Build/PathsModule.hs
@@ -72,16 +72,12 @@ generate pkg_descr lbi =
         "  ) where\n"++
         "\n"++
         foreign_imports++
-        "import qualified Control.Exception as Exception\n"++
+        "import Prelude (catch, IO, FilePath, return, (++))\n"++
         "import Data.Version (Version(..))\n"++
         "import System.Environment (getEnv)"++
         "\n"++
         "\nversion :: Version"++
-        "\nversion = " ++ show (packageVersion pkg_descr)++
-        "\n"++
-        "\n"++
-        "catchIO :: IO a -> (Exception.IOException -> IO a) -> IO a\n"++
-        "catchIO = Exception.catch\n"
+        "\nversion = " ++ show (packageVersion pkg_descr)
 
        body
         | absolute =
@@ -144,7 +140,7 @@ generate pkg_descr lbi =
         mkGetDir _   (Just dirrel) = "getPrefixDirRel " ++ show dirrel
         mkGetDir dir Nothing       = "return " ++ show dir
 
-        mkGetEnvOr var expr = "catchIO (getEnv \""++var'++"\")"++
+        mkGetEnvOr var expr = "catch (getEnv \""++var'++"\")"++
                               " (\\_ -> "++expr++")"
           where var' = pkgPathEnvVar pkg_descr var