[commit: Cabal] master: Change Safe Haskell package trust default to untrusted (bae46f1)

[David Terei]

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

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/bae46f1b90e90cb362c273c9b8384a87a5abb768

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

commit bae46f1b90e90cb362c273c9b8384a87a5abb768
Author: David Terei <davidterei at gmail.com>
Date:   Tue Oct 18 03:33:19 2011 +0000

    Change Safe Haskell package trust default to untrusted

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

 cabal/Distribution/InstalledPackageInfo.hs |    2 +-
 cabal/Distribution/Simple/GHC/IPI641.hs    |    2 +-
 cabal/Distribution/Simple/GHC/IPI642.hs    |    2 +-
 cabal/Distribution/Simple/Register.hs      |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/cabal/Distribution/InstalledPackageInfo.hs b/cabal/Distribution/InstalledPackageInfo.hs
index f5d3a82..db3a3e6 100644
--- a/cabal/Distribution/InstalledPackageInfo.hs
+++ b/cabal/Distribution/InstalledPackageInfo.hs
@@ -148,7 +148,7 @@ emptyInstalledPackageInfo
         exposed           = False,
         exposedModules    = [],
         hiddenModules     = [],
-        trusted           = True,
+        trusted           = False,
         importDirs        = [],
         libraryDirs       = [],
         hsLibraries       = [],
diff --git a/cabal/Distribution/Simple/GHC/IPI641.hs b/cabal/Distribution/Simple/GHC/IPI641.hs
index 1772ed0..222af1a 100644
--- a/cabal/Distribution/Simple/GHC/IPI641.hs
+++ b/cabal/Distribution/Simple/GHC/IPI641.hs
@@ -110,7 +110,7 @@ toCurrent ipi at InstalledPackageInfo{} = Current.InstalledPackageInfo {
     Current.exposed            = exposed ipi,
     Current.exposedModules     = map convertModuleName (exposedModules ipi),
     Current.hiddenModules      = map convertModuleName (hiddenModules ipi),
-    Current.trusted            = True,
+    Current.trusted            = Current.trusted Current.emptyInstalledPackageInfo,
     Current.importDirs         = importDirs ipi,
     Current.libraryDirs        = libraryDirs ipi,
     Current.hsLibraries        = hsLibraries ipi,
diff --git a/cabal/Distribution/Simple/GHC/IPI642.hs b/cabal/Distribution/Simple/GHC/IPI642.hs
index b56fcc3..b1b8bb7 100644
--- a/cabal/Distribution/Simple/GHC/IPI642.hs
+++ b/cabal/Distribution/Simple/GHC/IPI642.hs
@@ -145,7 +145,7 @@ toCurrent ipi at InstalledPackageInfo{} = Current.InstalledPackageInfo {
     Current.exposed            = exposed ipi,
     Current.exposedModules     = map convertModuleName (exposedModules ipi),
     Current.hiddenModules      = map convertModuleName (hiddenModules ipi),
-    Current.trusted            = True,
+    Current.trusted            = Current.trusted Current.emptyInstalledPackageInfo,
     Current.importDirs         = importDirs ipi,
     Current.libraryDirs        = libraryDirs ipi,
     Current.hsLibraries        = hsLibraries ipi,
diff --git a/cabal/Distribution/Simple/Register.hs b/cabal/Distribution/Simple/Register.hs
index 13af3e7..da33d45 100644
--- a/cabal/Distribution/Simple/Register.hs
+++ b/cabal/Distribution/Simple/Register.hs
@@ -275,7 +275,7 @@ generalInstalledPackageInfo adjustRelIncDirs pkg lib clbi installDirs =
     IPI.exposed            = libExposed  lib,
     IPI.exposedModules     = exposedModules lib,
     IPI.hiddenModules      = otherModules bi,
-    IPI.trusted            = True,
+    IPI.trusted            = IPI.trusted IPI.emptyInstalledPackageInfo,
     IPI.importDirs         = [ libdir installDirs | hasModules ],
     IPI.libraryDirs        = if hasLibrary
                                then libdir installDirs : extraLibDirs bi