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

convert some error to giveup

Browse source 
error has a backtrace, but these are non-internal errors, so a backtrace
is unlikely to be useful
This commit is contained in:
Joey Hess 2021-12-09 14:36:54 -04:00
parent ab3c13c021
commit a62f2e141b
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
3 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Git/Command.hs
View file

@ -39,7 +39,7 @@ runBool params repo = assertLocal repo $
run :: [CommandParam] -> Repo -> IO () run :: [CommandParam] -> Repo -> IO ()
run params repo = assertLocal repo $ run params repo = assertLocal repo $
unlessM (runBool params repo) $ unlessM (runBool params repo) $
error $ "git " ++ show params ++ " failed" giveup $ "git " ++ show params ++ " failed"
{- Runs git and forces it to be quiet, throwing an error if it fails. -} {- Runs git and forces it to be quiet, throwing an error if it fails. -}
runQuiet :: [CommandParam] -> Repo -> IO () runQuiet :: [CommandParam] -> Repo -> IO ()

2
Git/LsFiles.hs
View file

@ -68,7 +68,7 @@ safeForLsFiles r = isNothing (remoteName r)
guardSafeForLsFiles :: Repo -> IO a -> IO a guardSafeForLsFiles :: Repo -> IO a -> IO a
guardSafeForLsFiles r a guardSafeForLsFiles r a
| safeForLsFiles r = a | safeForLsFiles r = a
| otherwise = error $ "git ls-files is unsafe to run on repository " ++ repoDescribe r | otherwise = giveup $ "git ls-files is unsafe to run on repository " ++ repoDescribe r
data Options = ErrorUnmatch data Options = ErrorUnmatch

2
Git/Repair.hs
View file

@ -114,7 +114,7 @@ retrieveMissingObjects missing referencerepo r
| not (foundBroken missing) = return missing | not (foundBroken missing) = return missing
| otherwise = withTmpDir "tmprepo" $ \tmpdir -> do | otherwise = withTmpDir "tmprepo" $ \tmpdir -> do
unlessM (boolSystem "git" [Param "init", File tmpdir]) $ unlessM (boolSystem "git" [Param "init", File tmpdir]) $
error $ "failed to create temp repository in " ++ tmpdir giveup $ "failed to create temp repository in " ++ tmpdir
tmpr <- Config.read =<< Construct.fromPath (toRawFilePath tmpdir) tmpr <- Config.read =<< Construct.fromPath (toRawFilePath tmpdir)
let repoconfig r' = fromRawFilePath (localGitDir r' P.</> "config") let repoconfig r' = fromRawFilePath (localGitDir r' P.</> "config")
whenM (doesFileExist (repoconfig r)) $ whenM (doesFileExist (repoconfig r)) $