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

factored out some useful error catching methods

Browse source
This commit is contained in:
Joey Hess 2011-11-10 20:24:24 -04:00
parent a71c03bc51
commit 49d2177d51
15 changed files with 54 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

9
git-annex-shell.hs
View file

@ -104,9 +104,6 @@ checkNotReadOnly cmd
| otherwise = checkEnv "GIT_ANNEX_SHELL_READONLY"
checkEnv :: String -> IO ()
checkEnv var = catch check (const $ return ())
where
check = do
val <- getEnv var
when (not $ null val) $
error $ "Action blocked by " ++ var
checkEnv var =
whenM (not . null <$> catchDefaultIO (getEnv var) "") $
error $ "Action blocked by " ++ var