avoid using Data.AssocList, which is cunningly part of hxt

This commit is contained in:
Joey Hess 2012-11-27 22:57:04 -04:00
parent 6821279dd7
commit 6991f47e9e
2 changed files with 7 additions and 7 deletions

View file

@ -21,7 +21,6 @@ import Utility.OSX
import Utility.FreeDesktop
#endif
import Data.AssocList
import System.Posix.Env
standaloneAppBase :: IO (Maybe FilePath)
@ -84,9 +83,10 @@ cleanEnvironment = clean <$> getEnvironment
| otherwise = Just $ catMaybes $ map (restoreorig env) env
| otherwise = Nothing
where
vars = words $ lookup1 "GIT_ANNEX_STANDLONE_ENV" env
restoreorig oldenv p@(k, v)
| k `elem` vars = case lookup1 ("ORIG_" ++ k) oldenv of
"" -> Nothing
v' -> Just (k, v')
vars = words $ fromMaybe "" $
lookup "GIT_ANNEX_STANDLONE_ENV" env
restoreorig oldenv p@(k, _v)
| k `elem` vars = case lookup ("ORIG_" ++ k) oldenv of
Nothing -> Nothing
(Just v') -> Just (k, v')
| otherwise = Just p

View file

@ -20,4 +20,4 @@ building using cabal from clone of git clone git://git-annex.branchable.com/, co
Please provide any additional information below.
> [[done]], using Data.List instead now.