[commit: packages/Cabal] ghc-head: Tweak an error message. (9b7760a)

git at git.haskell.org git at git.haskell.org
Mon Aug 26 23:28:49 CEST 2013


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

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

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

commit 9b7760a0be15f49822416ef2633d07d9df21c3c6
Author: Mikhail Glushenkov <mikhail.glushenkov at gmail.com>
Date:   Mon Jul 22 15:53:05 2013 +0200

    Tweak an error message.


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

9b7760a0be15f49822416ef2633d07d9df21c3c6
 cabal-install/Distribution/Client/Tar.hs |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cabal-install/Distribution/Client/Tar.hs b/cabal-install/Distribution/Client/Tar.hs
index bb92d17..c0d5841 100644
--- a/cabal-install/Distribution/Client/Tar.hs
+++ b/cabal-install/Distribution/Client/Tar.hs
@@ -527,8 +527,8 @@ checkEntryTarbomb _ entry | nonFilesystemEntry = Nothing
 checkEntryTarbomb expectedTopDir entry =
   case FilePath.Native.splitDirectories (entryPath entry) of
     (topDir:_) | topDir == expectedTopDir -> Nothing
-    s -> Just $ "File in tar archive is not in the expected directory "
-             ++ show expectedTopDir
+    s -> Just $ "File in tar archive is not in the expected directory. "
+             ++ "Expected: " ++ show expectedTopDir
              ++ " but got the following hierarchy: "
              ++ show s
 





More information about the ghc-commits mailing list