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/NumCopies.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/NumCopies.hs')
| -rw-r--r-- | Command/NumCopies.hs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Command/NumCopies.hs b/Command/NumCopies.hs index 0a9c4404b..005a0d16a 100644 --- a/Command/NumCopies.hs +++ b/Command/NumCopies.hs @@ -23,15 +23,15 @@ seek = withWords start start :: [String] -> CommandStart start [] = startGet start [s] = case readish s of - Nothing -> error $ "Bad number: " ++ s + Nothing -> giveup $ "Bad number: " ++ s Just n | n > 0 -> startSet n | n == 0 -> ifM (Annex.getState Annex.force) ( startSet n - , error "Setting numcopies to 0 is very unsafe. You will lose data! If you really want to do that, specify --force." + , giveup "Setting numcopies to 0 is very unsafe. You will lose data! If you really want to do that, specify --force." ) - | otherwise -> error "Number cannot be negative!" -start _ = error "Specify a single number." + | otherwise -> giveup "Number cannot be negative!" +start _ = giveup "Specify a single number." startGet :: CommandStart startGet = next $ next $ do |