summaryrefslogtreecommitdiff
path: root/src/Propellor/CmdLine.hs
diff options
context:
space:
mode:
authorJoey Hess2017-07-30 11:30:05 -0400
committerJoey Hess2017-07-30 11:30:05 -0400
commit15f292d177ee96f5a1d384ce50f5246e3f7ea630 (patch)
tree033838d01471f633534c38e5d967264ae2dda634 /src/Propellor/CmdLine.hs
parent497e6b4a227dc977d6bb9fe5fe73aeeca9624244 (diff)
parent6f281e87084587987929dbb6a27671ad96858535 (diff)
Merge branch 'master' into joeyconfig
Diffstat (limited to 'src/Propellor/CmdLine.hs')
-rw-r--r--src/Propellor/CmdLine.hs1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/Propellor/CmdLine.hs b/src/Propellor/CmdLine.hs
index cba5991d..bd01b34c 100644
--- a/src/Propellor/CmdLine.hs
+++ b/src/Propellor/CmdLine.hs
@@ -111,6 +111,7 @@ data CanRebuild = CanRebuild | NoRebuild
defaultMain :: [Host] -> IO ()
defaultMain hostlist = withConcurrentOutput $ do
useFileSystemEncoding
+ setupGpgEnv
Shim.cleanEnv
checkDebugMode
cmdline <- processCmdLine