[commit: ghc] master: Comments only [skip ci] (aa778c8)

[git at git.haskell.org]

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

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/aa778c8e5142b5a30905be12062cf443268db7ae/ghc

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

commit aa778c8e5142b5a30905be12062cf443268db7ae
Author: Thomas Miedema <thomasmiedema at gmail.com>
Date:   Sat Jul 4 11:57:44 2015 +0200

    Comments only [skip ci]
    
    Follow up to 124f3999d78d8ef6b093e4f1bb1dcef87e4283da.


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

aa778c8e5142b5a30905be12062cf443268db7ae
 ghc/InteractiveUI.hs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/ghc/InteractiveUI.hs b/ghc/InteractiveUI.hs
index d392327..3912198 100644
--- a/ghc/InteractiveUI.hs
+++ b/ghc/InteractiveUI.hs
@@ -597,6 +597,10 @@ nextInputLine show_prompt is_tty
 checkFileAndDirPerms :: FilePath -> IO Bool
 checkFileAndDirPerms file = do
   file_ok <- checkPerms file
+  -- Do not check dir perms when .ghci doesn't exist, otherwise GHCi will
+  -- print some confusing and useless warnings in some cases (e.g. in
+  -- travis). Note that we can't add a test for this, as all ghci tests should
+  -- run with -ignore-dot-ghci, which means we never get here.
   if file_ok then checkPerms (getDirectory file) else return False
   where
   getDirectory f = case takeDirectory f of