[commit: packages/Cabal] ghc-head: Change an error message. (4c6fa93)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/Cabal

On branch  : ghc-head
Link       : http://git.haskell.org/?p=packages/Cabal.git;a=commit;h=4c6fa93ed7cf2268e82bf5c5aedfcaa4696d7760

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

commit 4c6fa93ed7cf2268e82bf5c5aedfcaa4696d7760
Author: Mikhail Glushenkov <mikhail.glushenkov at gmail.com>
Date:   Sat Sep 7 22:58:31 2013 +0200

    Change an error message.
    
    See #1488.


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

4c6fa93ed7cf2268e82bf5c5aedfcaa4696d7760
 .../Distribution/Client/Sandbox/PackageEnvironment.hs         |    9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/cabal-install/Distribution/Client/Sandbox/PackageEnvironment.hs b/cabal-install/Distribution/Client/Sandbox/PackageEnvironment.hs
index d8bb3fa..656b35d 100644
--- a/cabal-install/Distribution/Client/Sandbox/PackageEnvironment.hs
+++ b/cabal-install/Distribution/Client/Sandbox/PackageEnvironment.hs
@@ -340,7 +340,8 @@ createPackageEnvironmentFile :: Verbosity -> FilePath -> FilePath
                                 -> IO ()
 createPackageEnvironmentFile verbosity sandboxDir pkgEnvFile incComments
   compiler platform = do
-  notice verbosity $ "Writing a default package environment file to " ++ pkgEnvFile
+  notice verbosity $ "Writing a default package environment file to "
+    ++ pkgEnvFile
 
   commentPkgEnv <- commentPackageEnvironment sandboxDir
   initialPkgEnv <- initialPackageEnvironment sandboxDir compiler platform
@@ -437,9 +438,9 @@ parsePackageEnvironment initial str = do
                          return accum'
       | otherwise   =
         syntaxError line $
-        "This file was probably generated by cabal-dev. "
-        ++ "To use native cabal sandboxing, please delete '"
-        ++ userPackageEnvironmentFile ++ "' and run 'cabal sandbox init'."
+        "Named 'install-dirs' section: '" ++ name
+        ++ "'. Note that named 'install-dirs' sections are not allowed in the '"
+        ++ userPackageEnvironmentFile ++ "' file."
       where name' = lowercase name
     parseSection _accum f =
       syntaxError (lineNo f)  "Unrecognized stanza."