[commit: ghc] master: Fix '-distrust-all-packages' flag. (6e87d4b)

[David Terei]

Repository : ssh://darcs.haskell.org//srv/darcs/ghc

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/6e87d4b138b8c20f4ad6f842758b21f8509d4f60

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

commit 6e87d4b138b8c20f4ad6f842758b21f8509d4f60
Author: David Terei <davidterei at gmail.com>
Date:   Wed Feb 8 16:18:18 2012 -0800

    Fix '-distrust-all-packages' flag.

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

 compiler/main/DynFlags.hs  |    2 +-
 compiler/main/Packages.lhs |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/compiler/main/DynFlags.hs b/compiler/main/DynFlags.hs
index ac4df37..747b0b8 100644
--- a/compiler/main/DynFlags.hs
+++ b/compiler/main/DynFlags.hs
@@ -1717,9 +1717,9 @@ package_flags = [
   , Flag "ignore-package"        (HasArg ignorePackage)
   , Flag "syslib"                (HasArg (\s -> do exposePackage s
                                                    deprecate "Use -package instead"))
+  , Flag "distrust-all-packages" (NoArg (setDynFlag Opt_DistrustAllPackages))
   , Flag "trust"                 (HasArg trustPackage)
   , Flag "distrust"              (HasArg distrustPackage)
-  , Flag "distrust-all-packages" (NoArg (setDynFlag Opt_DistrustAllPackages))
   ]
 
 type TurnOnFlag = Bool   -- True  <=> we are turning the flag on
diff --git a/compiler/main/Packages.lhs b/compiler/main/Packages.lhs
index d1fbe2f..1d6ad4a 100644
--- a/compiler/main/Packages.lhs
+++ b/compiler/main/Packages.lhs
@@ -272,7 +272,7 @@ setBatchPackageFlags dflags pkgs = (maybeDistrustAll . maybeHideAll) pkgs
       | otherwise                           = pkgs'
 
     hide pkg = pkg{ exposed = False }
-    distrust pkg = pkg{ exposed = False }
+    distrust pkg = pkg{ trusted = False }
 
 -- TODO: This code is duplicated in utils/ghc-pkg/Main.hs
 mungePackagePaths :: FilePath -> FilePath -> PackageConfig -> PackageConfig