From 0bddf0ed87f747f1e3f833f6960f6cda79c60eb7 Mon Sep 17 00:00:00 2001 From: sheaf Date: Mon, 29 Apr 2024 13:00:46 +0200 Subject: [PATCH] PackageDescription warnings for normal verbosity This commit makes it so that cabal-install emits PackageDescription parser warnings at normal verbosity or above. Previously, we used to emit warnings at verbosity >= verbose, but now that we are going through in-library methods this meant we could skip ever emitting some warnings, which is not desirable. --- cabal-install/src/Distribution/Client/ProjectConfig.hs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cabal-install/src/Distribution/Client/ProjectConfig.hs b/cabal-install/src/Distribution/Client/ProjectConfig.hs index 5d04f101c7d..fa38ef21368 100644 --- a/cabal-install/src/Distribution/Client/ProjectConfig.hs +++ b/cabal-install/src/Distribution/Client/ProjectConfig.hs @@ -1522,8 +1522,8 @@ renderCabalFileParseError :: CabalFileParseError -> String renderCabalFileParseError (CabalFileParseError filePath contents errors _ warnings) = renderParseError filePath contents errors warnings --- | Wrapper for the @.cabal@ file parser. It reports warnings on higher --- verbosity levels and throws 'CabalFileParseError' on failure. +-- | Wrapper for the @.cabal@ file parser. It reports warnings at normal +-- verbosity level, and throws 'CabalFileParseError' on failure. readSourcePackageCabalFile :: Verbosity -> FilePath @@ -1533,7 +1533,7 @@ readSourcePackageCabalFile verbosity pkgfilename content = case runParseResult (parseGenericPackageDescription content) of (warnings, Right pkg) -> do unless (null warnings) $ - info verbosity (formatWarnings warnings) + notice verbosity (formatWarnings warnings) return pkg (warnings, Left (mspecVersion, errors)) -> throwIO $ CabalFileParseError pkgfilename content errors mspecVersion warnings