[commit: haddock] 2.15, 2.15.0.1, 2.15.0.2, T6018-injective-type-families, adamse-D1033, clean, fix-travis, ghc-head, master, metainfo, v2.15, wip/10268, wip/10313, wip/D538, wip/D538-1, wip/D538-2, wip/D538-3, wip/D538-4, wip/D538-5, wip/D538-6, wip/D548-master, wip/D548-master-2, wip/T10483, wip/T9840, wip/api-annot-tweaks-7.10, wip/api-annots-ghc-7.10-3, wip/orf-reboot: Revert "Track type signature change of lookupModuleInAllPackages" (13d022e)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/haddock

On branches: 2.15,2.15.0.1,2.15.0.2,T6018-injective-type-families,adamse-D1033,clean,fix-travis,ghc-head,master,metainfo,v2.15,wip/10268,wip/10313,wip/D538,wip/D538-1,wip/D538-2,wip/D538-3,wip/D538-4,wip/D538-5,wip/D538-6,wip/D548-master,wip/D548-master-2,wip/T10483,wip/T9840,wip/api-annot-tweaks-7.10,wip/api-annots-ghc-7.10-3,wip/orf-reboot
Link       : http://git.haskell.org/haddock.git/commitdiff/13d022e89d1fbe81ec318f7cc3ceace980f85d11

>---------------------------------------------------------------

commit 13d022e89d1fbe81ec318f7cc3ceace980f85d11
Author: Mateusz Kowalczyk <fuuzetsu at fuuzetsu.co.uk>
Date:   Thu Aug 14 20:23:27 2014 +0100

    Revert "Track type signature change of lookupModuleInAllPackages"
    
    This reverts commit d59fec2c9551b5662a3507c0011e32a09a9c118f.


>---------------------------------------------------------------

13d022e89d1fbe81ec318f7cc3ceace980f85d11
 src/Haddock/Interface/Create.hs | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/Haddock/Interface/Create.hs b/src/Haddock/Interface/Create.hs
index ad6a1e9..d211530 100644
--- a/src/Haddock/Interface/Create.hs
+++ b/src/Haddock/Interface/Create.hs
@@ -45,6 +45,7 @@ import Bag
 import RdrName
 import TcRnTypes
 import FastString (concatFS)
+import UniqFM
 
 
 -- | Use a 'TypecheckedModule' to produce an 'Interface'.
@@ -169,9 +170,11 @@ lookupModuleDyn ::
 lookupModuleDyn _ (Just pkgId) mdlName =
   Module.mkModule pkgId mdlName
 lookupModuleDyn dflags Nothing mdlName =
-  case Packages.lookupModuleInAllPackages dflags mdlName of
-    (m,_):_ -> m
-    [] -> Module.mkModule Module.mainPackageKey mdlName
+  flip Module.mkModule mdlName $
+  case filter Packages.modConfExposed . eltsUFM $
+       Packages.lookupModuleInAllPackages dflags mdlName of
+    m:_ -> Packages.packageConfigId (Packages.modConfPkg m)
+    [] -> Module.mainPackageKey
 
 
 -------------------------------------------------------------------------------