summaryrefslogtreecommitdiff
path: root/src/Propellor/CmdLine.hs
diff options
context:
space:
mode:
authorJoey Hess2016-12-26 12:08:02 -0400
committerJoey Hess2016-12-26 12:09:38 -0400
commit5605c9665e57b22c7415691984f31f75b3337cd9 (patch)
tree8f5790d1bb4dab6220e21449caf6ed1d5f802405 /src/Propellor/CmdLine.hs
parent1d868470e4ec6ec6211206003279ac4bc8465c4f (diff)
parent44bf67b7a2da75ef80e32d6409cc41a6ab8b6ffe (diff)
Merge branch 'joeyconfig'
Diffstat (limited to 'src/Propellor/CmdLine.hs')
-rw-r--r--src/Propellor/CmdLine.hs2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/Propellor/CmdLine.hs b/src/Propellor/CmdLine.hs
index 7840cc33..f26e0834 100644
--- a/src/Propellor/CmdLine.hs
+++ b/src/Propellor/CmdLine.hs
@@ -19,6 +19,7 @@ import Propellor.Types.CmdLine
import qualified Propellor.Property.Docker as Docker
import qualified Propellor.Property.Chroot as Chroot
import qualified Propellor.Shim as Shim
+import Utility.FileSystemEncoding
usage :: Handle -> IO ()
usage h = hPutStrLn h $ unlines
@@ -95,6 +96,7 @@ data CanRebuild = CanRebuild | NoRebuild
-- | Runs propellor on hosts, as controlled by command-line options.
defaultMain :: [Host] -> IO ()
defaultMain hostlist = withConcurrentOutput $ do
+ useFileSystemEncoding
Shim.cleanEnv
checkDebugMode
cmdline <- processCmdLine