From 0e9b3dc4b94ee910e354f8e9a6a3eeb3e771462a Mon Sep 17 00:00:00 2001 From: Simon Michael Date: Wed, 29 Mar 2017 07:45:07 -0700 Subject: [PATCH] cli: avoid processValue which prints stack traces (fixes #529) --- hledger/Hledger/Cli/CliOptions.hs | 2 +- hledger/Hledger/Cli/Main.hs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hledger/Hledger/Cli/CliOptions.hs b/hledger/Hledger/Cli/CliOptions.hs index e41c4e153..9db4ad4a0 100644 --- a/hledger/Hledger/Cli/CliOptions.hs +++ b/hledger/Hledger/Cli/CliOptions.hs @@ -444,7 +444,7 @@ checkCliOpts opts = getHledgerCliOpts :: Mode RawOpts -> IO CliOpts getHledgerCliOpts mode' = do args' <- getArgs - let rawopts = decodeRawOpts $ processValue mode' args' + let rawopts = either optserror decodeRawOpts $ process mode' args' opts <- rawOptsToCliOpts rawopts debugArgs args' opts when ("help" `inRawOpts` rawopts_ opts) $ putStr longhelp >> exitSuccess diff --git a/hledger/Hledger/Cli/Main.hs b/hledger/Hledger/Cli/Main.hs index 1d542c795..6537dddb8 100644 --- a/hledger/Hledger/Cli/Main.hs +++ b/hledger/Hledger/Cli/Main.hs @@ -164,7 +164,7 @@ argsToCliOpts :: [String] -> [String] -> IO CliOpts argsToCliOpts args addons = do let args' = moveFlagsAfterCommand args - cmdargsopts = processValue (mainmode addons) args' + cmdargsopts = either optserror id $ process (mainmode addons) args' cmdargsopts' = decodeRawOpts cmdargsopts rawOptsToCliOpts cmdargsopts'