wrath/shaniqua-plugins
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

two fixes for chasing dependencies via lookupPkg

Browse Source 
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
This commit is contained in:
Jeremy Shaw 2010-10-18 04:03:21 +00:00
parent c3cbce5390
commit 29547f0f81
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/System/Plugins/Env.hs
View File

@ -58,7 +58,8 @@ import Control.Monad ( liftM )
import Data.IORef ( writeIORef, readIORef, newIORef, IORef() ) import Data.IORef ( writeIORef, readIORef, newIORef, IORef() )
import Data.Maybe ( isJust, isNothing, fromMaybe ) 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.IO.Unsafe ( unsafePerformIO )
import System.Directory ( doesFileExist ) import System.Directory ( doesFileExist )
@ -299,8 +300,8 @@ union ls ps' =
let fm = emptyFM -- new FM for this package.conf let fm = emptyFM -- new FM for this package.conf
in foldr addOnePkg fm ps' : ls in foldr addOnePkg fm ps' : ls
where where
-- we add each package with and without it's version number -- we add each package with and without it's version number and with the full installedPackageId
addOnePkg p fm' = addToPkgEnvs (addToPkgEnvs fm' (display $ sourcePackageId p) p) addOnePkg p fm' = addToPkgEnvs (addToPkgEnvs (addToPkgEnvs fm' (display $ sourcePackageId p) p) (display $ installedPackageId p) p)
(packageName p) p (packageName p) p
-- if no version number specified, pick the higher version -- 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... -- up to loadObject not to load the same ones twice...
-- --
lookupPkg :: PackageName -> IO ([FilePath],[FilePath]) 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 (ps, (f, g)) <- lookupPkg' p
static <- isStaticPkg 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) return $ (nub $ (concat f') ++ f, if static then [] else nub $ (concat g') ++ g)
data LibrarySpec data LibrarySpec