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

Version handling wibbles.

Browse Source
This commit is contained in:
Lemmih 2007-01-29 03:16:34 +00:00
parent 5d497a1c60
commit bc5726ccd2
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -157,7 +157,7 @@ env = unsafePerformIO $ do
ref2 <- newIORef emptyFM ref2 <- newIORef emptyFM
p <- grabDefaultPkgConf p <- grabDefaultPkgConf
ref3 <- newIORef p -- package.conf info ref3 <- newIORef p -- package.conf info
ref4 <- newIORef (S.fromList ["base","Cabal","haskell-src"]) ref4 <- newIORef (S.fromList ["base","Cabal-1.1.6","haskell-src-1.0"]) -- FIXME
ref5 <- newIORef emptyFM -- merged files ref5 <- newIORef emptyFM -- merged files
return (mvar, ref1, ref2, ref3, ref4, ref5) return (mvar, ref1, ref2, ref3, ref4, ref5)
{-# NOINLINE env #-} {-# NOINLINE env #-}
@ -284,7 +284,9 @@ addPkgConf f = do
union :: PkgEnvs -> [PackageConfig] -> PkgEnvs union :: PkgEnvs -> [PackageConfig] -> PkgEnvs
union ls ps' = union ls ps' =
let fm = emptyFM -- new FM for this package.conf let fm = emptyFM -- new FM for this package.conf
in foldr (\p fm' -> addToFM fm' (packageName p) p) fm ps' : ls in foldr (\p fm' -> if packageName_ p == "base"
then addToFM fm' (packageName_ p) p
else addToFM fm' (packageName p) p) fm ps' : ls
-- --
-- | generate a PkgEnv from the system package.conf -- | generate a PkgEnv from the system package.conf

2
src/System/Plugins/Load.hs
View File

@ -413,7 +413,7 @@ loadFunction_ :: String
-> String -> String
-> IO (Maybe a) -> IO (Maybe a)
loadFunction_ m valsym loadFunction_ m valsym
= do let symbol = prefixUnderscore++m++"_"++(encode valsym)++"_closure" = do let symbol = prefixUnderscore++encode m++"_"++(encode valsym)++"_closure"
#if DEBUG #if DEBUG
putStrLn $ "Looking for <<"++symbol++">>" putStrLn $ "Looking for <<"++symbol++">>"
#endif #endif