mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

avoid empty env vars when setting up clean environment

Browse source
This commit is contained in:
Joey Hess 2013-12-31 14:55:55 -04:00
parent 72b592cdae
commit 5c834daf59
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Assistant/Install.hs
View file

@ -96,6 +96,7 @@ cleanEnvironment = clean <$> getEnvironment
lookup "GIT_ANNEX_STANDLONE_ENV" env lookup "GIT_ANNEX_STANDLONE_ENV" env
restoreorig oldenv p@(k, _v) restoreorig oldenv p@(k, _v)
| k `elem` vars = case lookup ("ORIG_" ++ k) oldenv of | k `elem` vars = case lookup ("ORIG_" ++ k) oldenv of
Nothing -> Nothing (Just v')
(Just v') -> Just (k, v') | not (null v') -> Just (k, v')
_ -> Nothing
| otherwise = Just p | otherwise = Just p