Tell users about cabal.project.local~

haskell · Jun 6, 2020 · 74ff63d · 74ff63d
1 parent 07c1a43
commit 74ff63d
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/cabal-install/Distribution/Client/CmdConfigure.hs b/cabal-install/Distribution/Client/CmdConfigure.hs
@@ -95,7 +95,7 @@ configureAction flags@NixStyleFlags {..} _extraArgs globalFlags = do
     -- before overwriting
     exists <- doesFileExist "cabal.project.local"
     when exists $ do
-        notice verbosity "'cabal.project.local' file already exists. Now overwriting it."
+        notice verbosity "'cabal.project.local' already exists, backing it up to 'cabal.project.local~'."
         copyFile "cabal.project.local" "cabal.project.local~"
     writeProjectLocalExtraConfig (distDirLayout baseCtx)
                                  cliConfig

diff --git a/cabal-testsuite/PackageTests/NewConfigure/LocalConfigOverwrite/cabal.out b/cabal-testsuite/PackageTests/NewConfigure/LocalConfigOverwrite/cabal.out
@@ -1,5 +1,5 @@
 # cabal v2-configure
-'cabal.project.local' file already exists. Now overwriting it.
+'cabal.project.local' already exists, backing it up to 'cabal.project.local~'.
 Resolving dependencies...
 Build profile: -w ghc-<GHCVER> -O1
 In order, the following would be built:

diff --git a/cabal-testsuite/PackageTests/NewConfigure/LocalConfigOverwrite/cabal.test.hs b/cabal-testsuite/PackageTests/NewConfigure/LocalConfigOverwrite/cabal.test.hs
@@ -3,4 +3,4 @@ import Test.Cabal.Prelude
 main = cabalTest $
     withSourceCopy $ do
         r <- cabal' "v2-configure" []
-        assertOutputContains "Now overwriting it" r
+        assertOutputContains "backing it up to" r