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 /Upgrade.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 'Upgrade.hs')
| -rw-r--r-- | Upgrade.hs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Upgrade.hs b/Upgrade.hs index 20ed7a402..c6552f89c 100644 --- a/Upgrade.hs +++ b/Upgrade.hs @@ -21,7 +21,7 @@ import qualified Upgrade.V4 import qualified Upgrade.V5 checkUpgrade :: Version -> Annex () -checkUpgrade = maybe noop error <=< needsUpgrade +checkUpgrade = maybe noop giveup <=< needsUpgrade needsUpgrade :: Version -> Annex (Maybe String) needsUpgrade v @@ -49,8 +49,8 @@ upgrade automatic destversion = do go (Just "0") = Upgrade.V0.upgrade go (Just "1") = Upgrade.V1.upgrade #else - go (Just "0") = error "upgrade from v0 on Windows not supported" - go (Just "1") = error "upgrade from v1 on Windows not supported" + go (Just "0") = giveup "upgrade from v0 on Windows not supported" + go (Just "1") = giveup "upgrade from v1 on Windows not supported" #endif go (Just "2") = Upgrade.V2.upgrade go (Just "3") = Upgrade.V3.upgrade automatic |