[project @ 2005-10-14 11:48:56 by simonmar]

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

diff --git a/ghc/compiler/main/Packages.lhs b/ghc/compiler/main/Packages.lhs
index a357480..21c5596 100644 (file)
--- a/ghc/compiler/main/Packages.lhs
+++ b/ghc/compiler/main/Packages.lhs
@@ -346,7 +346,8 @@ mkPackageState dflags orig_pkg_db = do
                  where myname = pkgName (package p)
                        myversion = pkgVersion (package p)
                        a_later_version_is_exposed
-                         = not (null [ p | p <- pkgs1, let pkg = package p,
+                         = not (null [ p | p <- pkgs1, exposed p,
+                                           let pkg = package p,
                                            pkgName pkg == myname,
                                            pkgVersion pkg > myversion ])
   --
@@ -653,7 +654,7 @@ add_package pkg_db ps p
   | p `elem` ps = return ps    -- Check if we've already added this package
   | otherwise =
       case lookupPackage pkg_db p of
-        Nothing -> Failed (missingPackageErr (packageIdString p))
+        Nothing -> Failed (missingPackageMsg (packageIdString p))
         Just pkg -> do
           -- Add the package's dependents also
           let deps = map mkPackageId (depends pkg)
@@ -661,7 +662,7 @@ add_package pkg_db ps p
           return (p : ps')
 
 missingPackageErr p = throwDyn (CmdLineError (showSDoc (missingPackageMsg p)))
-missingPackageMsg p = ptext SLIT("unknown package:") <> text p
+missingPackageMsg p = ptext SLIT("unknown package:") <+> text p
 
 -- -----------------------------------------------------------------------------
 -- The home module set