From de1c132ee4bcefbf44b33c39eaae1aca42eed406 Mon Sep 17 00:00:00 2001
From: Mikhail Glushenkov <the.dead.shall.rise@gmail.com>
Date: Fri, 16 Nov 2012 00:41:10 +0100
Subject: [PATCH] Remove some duplication.
---
cabal-install/Distribution/Client/Install.hs | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/cabal-install/Distribution/Client/Install.hs b/cabal-install/Distribution/Client/Install.hs
index 67c71be06d..aab9df1491 100644
--- a/cabal-install/Distribution/Client/Install.hs
+++ b/cabal-install/Distribution/Client/Install.hs
@@ -286,7 +286,7 @@ planPackages comp solver configFlags configExFlags installFlags
adjustPlanOnlyDeps :: InstallPlan -> Progress String String InstallPlan
adjustPlanOnlyDeps =
either (Fail . explain) Done
- . InstallPlan.remove (isTarget pkgSpecifiers)
+ . InstallPlan.remove (\pkg -> packageName pkg `elem` targetnames)
where
explain :: [InstallPlan.PlanProblem] -> String
explain problems =
@@ -422,11 +422,6 @@ data PackageStatus = NewPackage
type PackageChange = MergeResult PackageIdentifier PackageIdentifier
-isTarget :: Package pkg => [PackageSpecifier SourcePackage] -> pkg -> Bool
-isTarget pkgSpecifiers pkg = packageName pkg `elem` targetnames
- where
- targetnames = map pkgSpecifierTarget pkgSpecifiers
-
extractReinstalls :: PackageStatus -> [InstalledPackageId]
extractReinstalls (Reinstall ipids _) = ipids
extractReinstalls _ = []
--
GitLab