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/Dead.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/Dead.hs')
| -rw-r--r-- | Command/Dead.hs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Command/Dead.hs b/Command/Dead.hs index ecbe41293..44cf7b7f6 100644 --- a/Command/Dead.hs +++ b/Command/Dead.hs @@ -37,7 +37,7 @@ startKey key = do ls <- keyLocations key case ls of [] -> next $ performKey key - _ -> error "This key is still known to be present in some locations; not marking as dead." + _ -> giveup "This key is still known to be present in some locations; not marking as dead." performKey :: Key -> CommandPerform performKey key = do |