Fixups after rebase, add verbosity argument

Author: philderbeast

cabal-install/src/Distribution/Client/CmdBuild.hs

@@ -47,7 +47,7 @@ import Distribution.Simple.Command
   , option
   , usageAlternatives
   )
-import Distribution.Simple.Flag (Flag (..), fromFlag, fromFlagOrDefault, toFlag)
+import Distribution.Simple.Flag (Flag, fromFlag, toFlag)
 import Distribution.Simple.Utils
   ( dieWithException
   , wrapText

cabal-install/src/Distribution/Client/CmdFreeze.hs

@@ -52,7 +52,7 @@ import Distribution.PackageDescription
   ( FlagAssignment
   , nullFlagAssignment
   )
-import Distribution.Simple.Flag (fromFlagOrDefault, pattern Flag)
+import Distribution.Simple.Flag (pattern Flag)
 import Distribution.Simple.Utils
   ( dieWithException
   , notice

cabal-install/src/Distribution/Client/CmdGenBounds.hs

@@ -27,7 +27,7 @@ import Distribution.PackageDescription
 import Distribution.Simple.Utils
 import Distribution.Version
 
-import Distribution.Client.Setup (CommonSetupFlags (..), ConfigFlags (..), GlobalFlags (..))
+import Distribution.Client.Setup (GlobalFlags (..))
 
 -- Project orchestration imports
 
@@ -40,7 +40,6 @@ import Distribution.Client.ProjectOrchestration
 import Distribution.Client.ScriptUtils
 import Distribution.Client.TargetProblem
 import Distribution.Simple.Command
-import Distribution.Simple.Flag
 import Distribution.Types.Component
 import Distribution.Verbosity
 
@@ -84,8 +83,7 @@ genBoundsCommand =
 -- | The action for the @gen-bounds@ command when used in a project context.
 genBoundsAction :: NixStyleFlags GenBoundsFlags -> [String] -> GlobalFlags -> IO ()
 genBoundsAction flags targetStrings globalFlags =
-  withContextAndSelectors RejectNoTargets Nothing flags targetStrings globalFlags OtherCommand $ \targetCtx ctx targetSelectors -> do
-    let verbosity = fromFlagOrDefault normal (setupVerbosity $ configCommonFlags $ configFlags flags)
+  withContextAndSelectors verbosity RejectNoTargets Nothing flags targetStrings globalFlags OtherCommand $ \targetCtx ctx targetSelectors -> do
 
     baseCtx <- case targetCtx of
       ProjectContext -> return ctx
@@ -155,6 +153,8 @@ genBoundsAction flags targetStrings globalFlags =
         notice verbosity boundsNeededMsg
         mapM_ (renderBoundsResult verbosity) boundsActions
       else notice verbosity "All bounds up-to-date"
+ where
+  verbosity = cfgVerbosity normal flags
 
 data GenBoundsResult = GenBoundsResult PackageIdentifier ComponentTarget (Maybe [PackageIdentifier])
 

cabal-install/src/Distribution/Client/CmdOutdated.hs

@@ -240,6 +240,7 @@ getSourcePackages verbosity projectConfig =
 outdatedAction :: NixStyleFlags OutdatedFlags -> [String] -> GlobalFlags -> IO ()
 outdatedAction flags targetStrings globalFlags =
   withContextAndSelectors
+    verbosity
     AcceptNoTargets
     Nothing
     flags