From 29547f0f81b06a6132d8ab3cec110eac70fa890e Mon Sep 17 00:00:00 2001
From: Jeremy Shaw <jeremy@seereason.com>
Date: Mon, 18 Oct 2010 04:03:21 +0000
Subject: [PATCH] two fixes for chasing dependencies via lookupPkg

 1. union needs to add each package *three* times

    i.   with out the version number
    ii.  with the version number
    iii. with the full installed package id (new)

 2. lookupPkg needs to avoid getting caught in a loop by circular
 dependencies
---
 src/System/Plugins/Env.hs | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/System/Plugins/Env.hs b/src/System/Plugins/Env.hs
index 310f8bd..79db039 100644
--- a/src/System/Plugins/Env.hs
+++ b/src/System/Plugins/Env.hs
@@ -58,7 +58,8 @@ import Control.Monad            ( liftM )
 
 import Data.IORef               ( writeIORef, readIORef, newIORef, IORef() )
 import Data.Maybe               ( isJust, isNothing, fromMaybe )
-import Data.List                ( nub )
+import Data.List                ( (\\), nub, )
+import qualified Data.List      as List
 
 import System.IO.Unsafe         ( unsafePerformIO )
 import System.Directory         ( doesFileExist )
@@ -299,8 +300,8 @@ union ls ps' =
         let fm = emptyFM -- new FM for this package.conf
         in foldr addOnePkg fm ps' : ls
     where 
-      -- we add each package with and without it's version number
-      addOnePkg p fm' = addToPkgEnvs (addToPkgEnvs fm' (display $ sourcePackageId p) p)
+      -- we add each package with and without it's version number and with the full installedPackageId
+      addOnePkg p fm' = addToPkgEnvs (addToPkgEnvs (addToPkgEnvs fm' (display $ sourcePackageId p) p) (display $ installedPackageId p) p)
                                      (packageName p) p
       
       -- if no version number specified, pick the higher version
@@ -361,10 +362,13 @@ isStaticPkg pkg = withStaticPkgEnv env $ \set -> return $ S.member pkg set
 -- up to loadObject not to load the same ones twice...
 --
 lookupPkg :: PackageName -> IO ([FilePath],[FilePath])
-lookupPkg p = do 
+lookupPkg pn = go [] pn
+    where
+      go :: [PackageName] -> PackageName -> IO ([FilePath],[FilePath])
+      go seen p = do 
         (ps, (f, g)) <- lookupPkg' p
         static <- isStaticPkg p
-        (f', g') <- liftM unzip $ mapM lookupPkg ps
+        (f', g') <- liftM unzip $ mapM (go (nub $ seen ++ ps)) (ps \\ seen)
         return $ (nub $ (concat f') ++ f, if static then [] else nub $ (concat g') ++ g)
 
 data LibrarySpec