projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix spelling in comment
[ghc-hetmet.git]
/
utils
/
ghc-pkg
/
Main.hs
diff --git
a/utils/ghc-pkg/Main.hs
b/utils/ghc-pkg/Main.hs
index
a469ee7
..
51f1563
100644
(file)
--- a/
utils/ghc-pkg/Main.hs
+++ b/
utils/ghc-pkg/Main.hs
@@
-53,11
+53,12
@@
import qualified Data.Binary as Bin
import qualified Data.Binary.Get as Bin
#if __GLASGOW_HASKELL__ < 612 || defined(mingw32_HOST_OS)
import qualified Data.Binary.Get as Bin
#if __GLASGOW_HASKELL__ < 612 || defined(mingw32_HOST_OS)
+-- mingw32 needs these for getExecDir, GHC <6.12 needs them for openNewFile
import Foreign
import Foreign
+import Foreign.C
#endif
#if __GLASGOW_HASKELL__ < 612
#endif
#if __GLASGOW_HASKELL__ < 612
-import Foreign.C
import System.Posix.Internals
#if __GLASGOW_HASKELL__ >= 611
import GHC.IO.Handle.FD (fdToHandle)
import System.Posix.Internals
#if __GLASGOW_HASKELL__ >= 611
import GHC.IO.Handle.FD (fdToHandle)
@@
-571,7
+572,7
@@
readParseDatabase verbosity mb_user_conf use_cache path
case e_tcache of
Left ex -> do
when (verbosity > Normal) $
case e_tcache of
Left ex -> do
when (verbosity > Normal) $
- putStrLn ("warning: cannot read cache file " ++ cache ++ ": " ++ show ex)
+ warn ("warning: cannot read cache file " ++ cache ++ ": " ++ show ex)
ignore_cache
Right tcache
| tcache >= tdir -> do
ignore_cache
Right tcache
| tcache >= tdir -> do
@@
-582,8
+583,8
@@
readParseDatabase verbosity mb_user_conf use_cache path
return PackageDB { location = path, packages = pkgs' }
| otherwise -> do
when (verbosity >= Normal) $ do
return PackageDB { location = path, packages = pkgs' }
| otherwise -> do
when (verbosity >= Normal) $ do
- putStrLn ("WARNING: cache is out of date: " ++ cache)
- putStrLn " use 'ghc-pkg recache' to fix."
+ warn ("WARNING: cache is out of date: " ++ cache)
+ warn " use 'ghc-pkg recache' to fix."
ignore_cache
where
ignore_cache = do
ignore_cache
where
ignore_cache = do
@@
-859,7
+860,7
@@
listPackages verbosity my_flags mPackageName mModuleName = do
when (not (null broken) && not simple_output && verbosity /= Silent) $ do
prog <- getProgramName
when (not (null broken) && not simple_output && verbosity /= Silent) $ do
prog <- getProgramName
- putStrLn ("WARNING: there are broken packages. Run '" ++ prog ++ " check' for more details.")
+ warn ("WARNING: there are broken packages. Run '" ++ prog ++ " check' for more details.")
if simple_output then show_simple stack else do
if simple_output then show_simple stack else do
@@
-1347,7
+1348,7
@@
checkGHCiLib dirs batch_lib_dir batch_lib_file lib auto_build
| otherwise = do
m <- doesFileExistOnPath ghci_lib_file dirs
when (isNothing m && ghci_lib_file /= "HSrts.o") $
| otherwise = do
m <- doesFileExistOnPath ghci_lib_file dirs
when (isNothing m && ghci_lib_file /= "HSrts.o") $
- hPutStrLn stderr ("warning: can't find GHCi lib " ++ ghci_lib_file)
+ warn ("warning: can't find GHCi lib " ++ ghci_lib_file)
where
ghci_lib_file = lib <.> "o"
where
ghci_lib_file = lib <.> "o"
@@
-1454,6
+1455,11
@@
dieOrForceAll :: Force -> String -> IO ()
dieOrForceAll ForceAll s = ignoreError s
dieOrForceAll _other s = dieForcible s
dieOrForceAll ForceAll s = ignoreError s
dieOrForceAll _other s = dieForcible s
+warn :: String -> IO ()
+warn s = do
+ hFlush stdout
+ hPutStrLn stderr s
+
ignoreError :: String -> IO ()
ignoreError s = reportError (s ++ " (ignoring)")
ignoreError :: String -> IO ()
ignoreError s = reportError (s ++ " (ignoring)")