diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2016-11-15 21:29:54 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2016-11-15 21:29:54 -0400 |
| commit | 381766efcdddb4c8706408a90c515470a6aa43a7 (patch) | |
| tree | dda693b36724839ff2daff0e0766b7bdd883ea2c /Command/Assistant.hs | |
| parent | 27fafd61c39f8436e19e8fd449b5851ead10bbd1 (diff) | |
Avoid backtraces on expected failures when built with ghc 8; only use backtraces for unexpected errors.
ghc 8 added backtraces on uncaught errors. This is great, but git-annex was
using error in many places for a error message targeted at the user, in
some known problem case. A backtrace only confuses such a message, so omit it.
Notably, commands like git annex drop that failed due to eg, numcopies,
used to use error, so had a backtrace.
This commit was sponsored by Ethan Aubin.
Diffstat (limited to 'Command/Assistant.hs')
| -rw-r--r-- | Command/Assistant.hs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Command/Assistant.hs b/Command/Assistant.hs index 690f36f19..6a9ae6436 100644 --- a/Command/Assistant.hs +++ b/Command/Assistant.hs @@ -66,14 +66,14 @@ startNoRepo :: AssistantOptions -> IO () startNoRepo o | autoStartOption o = autoStart o | autoStopOption o = autoStop - | otherwise = error "Not in a git repository." + | otherwise = giveup "Not in a git repository." autoStart :: AssistantOptions -> IO () autoStart o = do dirs <- liftIO readAutoStartFile when (null dirs) $ do f <- autoStartFile - error $ "Nothing listed in " ++ f + giveup $ "Nothing listed in " ++ f program <- programPath haveionice <- pure Build.SysConfig.ionice <&&> inPath "ionice" forM_ dirs $ \d -> do |