X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2Fmain%2FPackages.lhs;h=f6ba7c192da08a90426cf67b33ec3afe923831ec;hp=35fc5109c3512b0cebb9c844bc591cbf82b05323;hb=8e8068df44747a15cbaf4d1d6b2c4a847dfca653;hpb=3e18f8be62b06c846b52d79717f79d51e2060593 diff --git a/compiler/main/Packages.lhs b/compiler/main/Packages.lhs index 35fc510..f6ba7c1 100644 --- a/compiler/main/Packages.lhs +++ b/compiler/main/Packages.lhs @@ -556,12 +556,12 @@ shadowPackages pkgs preferred in listToFM shadowed where check (shadowed,pkgmap) pkg - | Just oldpkg <- lookupUFM pkgmap (packageConfigId pkg), - let + | Just oldpkg <- lookupUFM pkgmap (packageConfigId pkg) + , let ipid_new = installedPackageId pkg - ipid_old = installedPackageId oldpkg, + ipid_old = installedPackageId oldpkg -- - ipid_old /= ipid_new + , ipid_old /= ipid_new = if ipid_old `elem` preferred then ( (ipid_new, ShadowedBy ipid_old) : shadowed, pkgmap ) else ( (ipid_old, ShadowedBy ipid_new) : shadowed, pkgmap' )