improve the warning when ignoring hpack file

kadoban · kadoban · commit 6bc1269f0fdf · 2017-12-09T15:53:46.000-07:00
diff --git a/src/Stack/Package.hs b/src/Stack/Package.hs
@@ -1354,8 +1354,11 @@ hpack pkgDir = do
                         ]
                     Hpack.ExistingCabalFileWasModifiedManually -> prettyWarnL
                         [ cabalFile
-                        , flow "was modified manually.  Ignoring package.yaml in favor of cabal file."
-                        , flow "If you want to use package.yaml instead of the cabal file, "
+                        , flow "was modified manually. Ignoring"
+                        , display hpackFile
+                        , flow "in favor of the cabal file. If you want to use the"
+                        , display . filename $ hpackFile
+                        , flow "file instead of the cabal file,"
                         , flow "then please delete the cabal file."
                         ]
             HpackCommand command -> do

Original file line number	Diff line number	Diff line change
`@@ -1354,8 +1354,11 @@ hpack pkgDir = do`
`1354`	`1354`	`]`
`1355`	`1355`	`Hpack.ExistingCabalFileWasModifiedManually -> prettyWarnL`
`1356`	`1356`	`[ cabalFile`
`1357`		`- , flow "was modified manually. Ignoring package.yaml in favor of cabal file."`
`1358`		`- , flow "If you want to use package.yaml instead of the cabal file, "`
	`1357`	`+ , flow "was modified manually. Ignoring"`
	`1358`	`+ , display hpackFile`
	`1359`	`+ , flow "in favor of the cabal file. If you want to use the"`
	`1360`	`+ , display . filename $ hpackFile`
	`1361`	`+ , flow "file instead of the cabal file,"`
`1359`	`1362`	`, flow "then please delete the cabal file."`
`1360`	`1363`	`]`
`1361`	`1364`	`HpackCommand command -> do`