summaryrefslogtreecommitdiff
path: root/Option.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2012-04-30 13:59:05 -0400
committerGravatar Joey Hess <joey@kitenet.net>2012-04-30 13:59:05 -0400
commitbf70bbdbfc875836cf880ba8a03cac74948a30a3 (patch)
tree1f422e9cbf29e3541787abb9522f9ecd561f65ce /Option.hs
parent0c9c14b52fcdd9684da70c8dd763661acdbd3843 (diff)
fix test suite build
Diffstat (limited to 'Option.hs')
-rw-r--r--Option.hs8
1 files changed, 3 insertions, 5 deletions
diff --git a/Option.hs b/Option.hs
index 769622055..1bac2cd05 100644
--- a/Option.hs
+++ b/Option.hs
@@ -32,11 +32,11 @@ common =
"avoid slow operations"
, Option ['a'] ["auto"] (NoArg (setauto True))
"automatic mode"
- , Option ['q'] ["quiet"] (NoArg (setoutput QuietOutput))
+ , Option ['q'] ["quiet"] (NoArg (Annex.setOutput QuietOutput))
"avoid verbose output"
- , Option ['v'] ["verbose"] (NoArg (setoutput NormalOutput))
+ , Option ['v'] ["verbose"] (NoArg (Annex.setOutput NormalOutput))
"allow verbose output (default)"
- , Option ['j'] ["json"] (NoArg (setoutput JSONOutput))
+ , Option ['j'] ["json"] (NoArg (Annex.setOutput JSONOutput))
"enable JSON output"
, Option ['d'] ["debug"] (NoArg setdebug)
"show debug messages"
@@ -47,8 +47,6 @@ common =
setforce v = Annex.changeState $ \s -> s { Annex.force = v }
setfast v = Annex.changeState $ \s -> s { Annex.fast = v }
setauto v = Annex.changeState $ \s -> s { Annex.auto = v }
- setoutput v = Annex.changeState $ \s ->
- s { Annex.output = (Annex.output s) { outputType = v } }
setforcebackend v = Annex.changeState $ \s -> s { Annex.forcebackend = Just v }
setdebug = liftIO $ updateGlobalLogger rootLoggerName $
setLevel DEBUG