[project @ 2005-01-12 13:44:20 by simonmar]

Track removal of Distribution.Compat.Error.

diff --git a/ghc/lib/compat/Distribution/Compat/Error.hs b/ghc/lib/compat/Distribution/Compat/Error.hs
deleted file mode 100644 (file)
index d9ef96c..0000000
--- a/ghc/lib/compat/Distribution/Compat/Error.hs
+++ /dev/null
@@ -1,3 +0,0 @@
-{-# OPTIONS -cpp #-}
-#include "Cabal/Distribution/Compat/Error.hs"
--- dummy comment

diff --git a/ghc/lib/compat/Makefile b/ghc/lib/compat/Makefile
index db90361..2d5ef01 100644 (file)
--- a/ghc/lib/compat/Makefile
+++ b/ghc/lib/compat/Makefile
@@ -22,7 +22,6 @@ ifeq "$(ghc_603_plus)" "YES"
 # These modules are all provided in GHC 6.3+
 EXCLUDED_SRCS += \
        System/FilePath.hs \
-       Distribution/Compat/Error.hs \
        Distribution/Compat/ReadP.hs \
        Distribution/Extension.hs \
        Distribution/GetOpt.hs \
@@ -36,7 +35,6 @@ endif
 
 # Some explicit dependencies
 System/FilePath.$(way_)o : $(FPTOOLS_TOP)/libraries/base/System/FilePath.hs
-Distribution/Compat/Error.$(way_)o : $(FPTOOLS_TOP)/libraries/Cabal/Distribution/Compat/Error.hs
 Distribution/Compat/ReadP.$(way_) : $(FPTOOLS_TOP)/libraries/Cabal/Distribution/Compat/ReadP.hs
 Distribution/Extension.$(way_)o    : $(FPTOOLS_TOP)/libraries/Cabal/Distribution/Extension.hs
 Distribution/GetOpt.$(way_)o    : $(FPTOOLS_TOP)/libraries/Cabal/Distribution/GetOpt.hs

diff --git a/ghc/utils/ghc-pkg/Main.hs b/ghc/utils/ghc-pkg/Main.hs
index b455d68..e57a383 100644 (file)
--- a/ghc/utils/ghc-pkg/Main.hs
+++ b/ghc/utils/ghc-pkg/Main.hs
@@ -9,7 +9,6 @@
 
 -- TODO:
 --     - validate modules
---     - expose/hide
 --     - expanding of variables in new-style package conf
 --     - version manipulation (checking whether old version exists,
 --       hiding old version?)
@@ -19,7 +18,7 @@ module Main (main) where
 import Version ( version, targetOS, targetARCH )
 import Distribution.InstalledPackageInfo
 import Distribution.Compat.ReadP
-import Distribution.ParseUtils ( showError )
+import Distribution.ParseUtils ( showError, ParseResult(..) )
 import Distribution.Package
 import Distribution.Version
 import Compat.Directory        ( getAppUserDataDirectory, createDirectoryIfMissing )
@@ -338,8 +337,8 @@ parsePackageInfo
        -> IO InstalledPackageInfo
 parsePackageInfo str defines force =
   case parseInstalledPackageInfo str of
-    Right ok -> return ok
-    Left err -> die (showError err)
+    ParseOk ok -> return ok
+    ParseFailed err -> die (showError err)
 
 -- Used for converting versionless package names to new
 -- PackageIdentifiers.  "Version [] []" is special: it means "no

diff --git a/ghc/utils/ghc-pkg/Makefile b/ghc/utils/ghc-pkg/Makefile
index f48ce34..c7ee909 100644 (file)
--- a/ghc/utils/ghc-pkg/Makefile
+++ b/ghc/utils/ghc-pkg/Makefile
@@ -47,7 +47,6 @@ endif
 SRC_MKDEPENDHS_OPTS += \
        -optdep--exclude-module=Compat.RawSystem \
        -optdep--exclude-module=Compat.Directory \
-       -optdep--exclude-module=Distribution.Compat.Error \
        -optdep--exclude-module=Distribution.Compat.ReadP \
        -optdep--exclude-module=Distribution.Extension \
        -optdep--exclude-module=Distribution.GetOpt \