From a1a608e7404501114608353708c458e9c57146e0 Mon Sep 17 00:00:00 2001 From: Mike Pilgrem Date: Mon, 30 Jan 2023 21:18:16 +0000 Subject: [PATCH] Re #6046 Fix S-6739 error --- doc/maintainers/stack_errors.md | 2 +- src/Stack/Build/Execute.hs | 2 +- src/Stack/Types/Build.hs | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/maintainers/stack_errors.md b/doc/maintainers/stack_errors.md index 2623a8c8af..f0c89ca580 100644 --- a/doc/maintainers/stack_errors.md +++ b/doc/maintainers/stack_errors.md @@ -333,7 +333,7 @@ to take stock of the errors that Stack itself can raise, by reference to the [S-7868] | TaskCycleBug PackageIdentifier [S-8923] | PackageIdMissingBug PackageIdentifier [S-7371] | AllInOneBuildBug - [S-6739] | MulipleResultsBug PackageName [DumpPackage] + [S-6739] | MultipleResultsBug PackageName [DumpPackage] [S-3121] | TemplateHaskellNotFoundBug [S-6901] | HaddockIndexNotFound [S-5452] | ShowBuildErrorBug diff --git a/src/Stack/Build/Execute.hs b/src/Stack/Build/Execute.hs index 49472bce3a..5fa598db02 100644 --- a/src/Stack/Build/Execute.hs +++ b/src/Stack/Build/Execute.hs @@ -2088,7 +2088,7 @@ singleBuild ac@ActionContext {..} ee@ExecuteEnv {..} task@Task {..} installedMap [dp] -> do liftIO $ atomically $ modifyTVar' tvar (Map.insert (dpGhcPkgId dp) dp) pure $ Just (dpGhcPkgId dp) - _ -> throwM $ MulipleResultsBug name dps + _ -> throwM $ MultipleResultsBug name dps -- | Get the build status of all the package executables. Do so by -- testing whether their expected output file exists, e.g. diff --git a/src/Stack/Types/Build.hs b/src/Stack/Types/Build.hs index c32ed13d5f..4c9d452083 100644 --- a/src/Stack/Types/Build.hs +++ b/src/Stack/Types/Build.hs @@ -135,7 +135,7 @@ data BuildException | TaskCycleBug PackageIdentifier | PackageIdMissingBug PackageIdentifier | AllInOneBuildBug - | MulipleResultsBug PackageName [DumpPackage] + | MultipleResultsBug PackageName [DumpPackage] | TemplateHaskellNotFoundBug | HaddockIndexNotFound | ShowBuildErrorBug @@ -344,7 +344,7 @@ instance Exception BuildException where ++ show ident displayException AllInOneBuildBug = bugReport "[S-7371]" "Cannot have an all-in-one build that also has a final build step." - displayException (MulipleResultsBug name dps) = bugReport "[S-6739]" + displayException (MultipleResultsBug name dps) = bugReport "[S-6739]" $ "singleBuild: multiple results when describing installed package " ++ show (name, dps) displayException TemplateHaskellNotFoundBug = bugReport "[S-3121]"