Follow Cabal changes

[ghc-hetmet.git] / compiler / main / Packages.lhs

diff --git a/compiler/main/Packages.lhs b/compiler/main/Packages.lhs
index 712682e..d468b79 100644 (file)
--- a/compiler/main/Packages.lhs
+++ b/compiler/main/Packages.lhs
@@ -49,6 +49,7 @@ import Outputable
 import System.Environment ( getEnv )
 import Distribution.InstalledPackageInfo hiding (depends)
 import Distribution.Package hiding (depends)
+import Distribution.Text
 import Distribution.Version
 import FastString
 import ErrUtils         ( debugTraceMsg, putMsg, Message )
@@ -318,7 +319,7 @@ matchingPackages str pkgs
        -- version, or just the name if it is unambiguous.
        matches str p
                =  str == display (package p)
-               || str == pkgName (package p)
+               || str == display (pkgName (package p))
 
 pickPackages :: [PackageConfig] -> [String] -> [PackageConfig]
 pickPackages pkgs strs = 
@@ -387,7 +388,7 @@ findWiredInPackages dflags pkgs preload this_package = do
 
         matches :: PackageConfig -> (PackageId, [String]) -> Bool
         pc `matches` (pid, suffixes)
-            = pkgName (package pc) `elem`
+            = display (pkgName (package pc)) `elem`
               (map (packageIdString pid ++) suffixes)
 
        -- find which package corresponds to each wired-in package
@@ -445,7 +446,7 @@ findWiredInPackages dflags pkgs preload this_package = do
 
        upd_pid pid = case filter ((== pid) . fst) wired_in_ids of
                                [] -> pid
-                               ((x, y):_) -> x{ pkgName = packageIdString y,
+                               ((x, y):_) -> x{ pkgName = PackageName (packageIdString y),
                                                  pkgVersion = Version [] [] }
 
         pkgs1 = deleteOtherWiredInPackages pkgs
@@ -723,10 +724,7 @@ dumpPackages :: DynFlags -> IO ()
 dumpPackages dflags
   = do  let pkg_map = pkgIdMap (pkgState dflags)
        putMsg dflags $
-             vcat (map (text.showInstalledPackageInfo.to_ipi) (eltsUFM pkg_map))
- where
-  to_ipi pkgconf@(InstalledPackageInfo { exposedModules = e,
-                                         hiddenModules = h }) = 
-    pkgconf{ exposedModules = map moduleNameString e,
-             hiddenModules  = map moduleNameString h }
+              vcat (map (text . showInstalledPackageInfo
+                              . packageConfigToInstalledPackageInfo)
+                        (eltsUFM pkg_map))
 \end{code}