[commit: ghc] wip/nfs-locking: Minor revision (acd5c37)

[git at git.haskell.org]

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

On branch  : wip/nfs-locking
Link       : http://ghc.haskell.org/trac/ghc/changeset/acd5c37535be71bc36dbf73ae09a772af5d63fda/ghc

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

commit acd5c37535be71bc36dbf73ae09a772af5d63fda
Author: Andrey Mokhov <andrey.mokhov at gmail.com>
Date:   Sun Aug 20 15:23:24 2017 +0100

    Minor revision


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

acd5c37535be71bc36dbf73ae09a772af5d63fda
 src/CommandLine.hs       | 9 ++++-----
 src/Hadrian/Utilities.hs | 2 +-
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/CommandLine.hs b/src/CommandLine.hs
index fbf3e07..cc6f944 100644
--- a/src/CommandLine.hs
+++ b/src/CommandLine.hs
@@ -15,8 +15,8 @@ import System.Environment
 -- | All arguments that can be passed to Hadrian via the command line.
 data CommandLineArgs = CommandLineArgs
     { buildHaddock   :: Bool
-    , installDestDir :: Maybe String
     , flavour        :: Maybe String
+    , installDestDir :: Maybe String
     , integerSimple  :: Bool
     , progressColour :: UseColour
     , progressInfo   :: ProgressInfo
@@ -115,12 +115,12 @@ cmdLineArgs = userSetting defaultCommandLineArgs
 cmdBuildHaddock :: Action Bool
 cmdBuildHaddock = buildHaddock <$> cmdLineArgs
 
-cmdInstallDestDir :: Action (Maybe String)
-cmdInstallDestDir = installDestDir <$> cmdLineArgs
-
 cmdFlavour :: Action (Maybe String)
 cmdFlavour = flavour <$> cmdLineArgs
 
+cmdInstallDestDir :: Action (Maybe String)
+cmdInstallDestDir = installDestDir <$> cmdLineArgs
+
 cmdIntegerSimple :: Action Bool
 cmdIntegerSimple = integerSimple <$> cmdLineArgs
 
@@ -135,4 +135,3 @@ cmdSkipConfigure = skipConfigure <$> cmdLineArgs
 
 cmdSplitObjects :: Action Bool
 cmdSplitObjects = splitObjects <$> cmdLineArgs
-
diff --git a/src/Hadrian/Utilities.hs b/src/Hadrian/Utilities.hs
index f1db28e..4051347 100644
--- a/src/Hadrian/Utilities.hs
+++ b/src/Hadrian/Utilities.hs
@@ -177,7 +177,7 @@ copyFile source target = do
     let dir = takeDirectory target
     liftIO $ IO.createDirectoryIfMissing True dir
     putProgressInfo =<< renderAction "Copy file" source target
-    copyFileChanged source target
+    quietly $ copyFileChanged source target
 
 -- | Copy a file without tracking the source. Create the target directory if missing.
 copyFileUntracked :: FilePath -> FilePath -> Action ()