[commit: ghc] master: Deprecate old -package-conf flags. (aab1fe2)

[Paolo Capriotti]

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

On branch  : master

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

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

commit aab1fe263304c63046f515201f2beed53a15fe68
Author: Paolo Capriotti <p.capriotti at gmail.com>
Date:   Fri Jun 8 15:38:27 2012 +0100

    Deprecate old -package-conf flags.

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

 compiler/main/DynFlags.hs |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/compiler/main/DynFlags.hs b/compiler/main/DynFlags.hs
index 33c5d5b..c45bb2d 100644
--- a/compiler/main/DynFlags.hs
+++ b/compiler/main/DynFlags.hs
@@ -1785,8 +1785,12 @@ package_flags = [
   , Flag "user-package-db"       (NoArg (addPkgConfRef UserPkgConf))
 
     -- backwards compat with GHC<=7.4 :
-  , Flag "package-conf"          (HasArg (addPkgConfRef . PkgConfFile))
-  , Flag "no-user-package-conf"  (NoArg removeUserPkgConf)
+  , Flag "package-conf"          (HasArg $ \path -> do
+                                    addPkgConfRef (PkgConfFile path)
+                                    deprecate "Use -package-db instead")
+  , Flag "no-user-package-conf"  (NoArg $ do
+                                    removeUserPkgConf
+                                    deprecate "Use -no-user-package-db instead")
 
   , Flag "package-name"          (hasArg setPackageName)
   , Flag "package-id"            (HasArg exposePackageId)