Repository : ssh://[email protected]/Cabal On branch : ghc-head Link : http://git.haskell.org/?p=packages/Cabal.git;a=commit;h=c9e10506a943d6ce4542b8bade9c7aaf4c2321ce
>--------------------------------------------------------------- commit c9e10506a943d6ce4542b8bade9c7aaf4c2321ce Author: Mikhail Glushenkov <[email protected]> Date: Fri Aug 30 01:34:00 2013 +0200 Warnings. >--------------------------------------------------------------- c9e10506a943d6ce4542b8bade9c7aaf4c2321ce Cabal/Distribution/Simple/PreProcess.hs | 2 +- cabal-install/Distribution/Client/Compat/Environment.hs | 3 +-- cabal-install/Distribution/Client/Win32SelfUpgrade.hs | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Cabal/Distribution/Simple/PreProcess.hs b/Cabal/Distribution/Simple/PreProcess.hs index 730c6d3..e34d325 100644 --- a/Cabal/Distribution/Simple/PreProcess.hs +++ b/Cabal/Distribution/Simple/PreProcess.hs @@ -74,7 +74,7 @@ import qualified Distribution.Simple.PackageIndex as PackageIndex import Distribution.Simple.CCompiler ( cSourceExtensions ) import Distribution.Simple.Compiler - ( CompilerFlavor(..), Compiler(..), compilerFlavor, compilerVersion ) + ( CompilerFlavor(..), compilerFlavor, compilerVersion ) import Distribution.Simple.LocalBuildInfo ( LocalBuildInfo(..), Component(..) ) import Distribution.Simple.BuildPaths (autogenModulesDir,cppHeaderName) diff --git a/cabal-install/Distribution/Client/Compat/Environment.hs b/cabal-install/Distribution/Client/Compat/Environment.hs index 20a3f29..86bfa41 100644 --- a/cabal-install/Distribution/Client/Compat/Environment.hs +++ b/cabal-install/Distribution/Client/Compat/Environment.hs @@ -27,6 +27,7 @@ import Control.Monad import Foreign.C.Types import Foreign.C.String import Foreign.C.Error (throwErrnoIfMinus1_) +import System.Posix.Internals ( withFilePath ) #endif /* mingw32_HOST_OS */ #if MIN_VERSION_base(4,6,0) @@ -36,8 +37,6 @@ import System.Environment (getEnv) import Distribution.Compat.Exception (catchIO) #endif -import System.Posix.Internals ( withFilePath ) - #if !MIN_VERSION_base(4,6,0) -- | @lookupEnv var@ returns the value of the environment variable @var@, or -- @Nothing@ if there is no such value. diff --git a/cabal-install/Distribution/Client/Win32SelfUpgrade.hs b/cabal-install/Distribution/Client/Win32SelfUpgrade.hs index 5b23c43..87f0efe 100644 --- a/cabal-install/Distribution/Client/Win32SelfUpgrade.hs +++ b/cabal-install/Distribution/Client/Win32SelfUpgrade.hs @@ -120,7 +120,7 @@ scheduleOurDemise verbosity dstPath tmpPath mkArgs = do let args = mkArgs (show ourPID) tmpPath log $ "launching child " ++ unwords (dstPath : map show args) - runProcess dstPath args Nothing Nothing Nothing Nothing Nothing + _ <- runProcess dstPath args Nothing Nothing Nothing Nothing Nothing log $ "waiting for the child to start up" waitForSingleObject event (10*1000) -- wait at most 10 sec _______________________________________________ ghc-commits mailing list [email protected] http://www.haskell.org/mailman/listinfo/ghc-commits
