From a3206d45d6fe161091d008d39ec86a2263d95446 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 4 Apr 2014 02:06:19 -0400 Subject: redo a change I lost somewhere fixes ghc spain in i386 container on amd64 host --- Propellor/CmdLine.hs | 2 ++ 1 file changed, 2 insertions(+) (limited to 'Propellor/CmdLine.hs') diff --git a/Propellor/CmdLine.hs b/Propellor/CmdLine.hs index a9c61993..d10211f0 100644 --- a/Propellor/CmdLine.hs +++ b/Propellor/CmdLine.hs @@ -11,6 +11,7 @@ import System.PosixCompat import Propellor import qualified Propellor.Property.Docker as Docker +import qualified Propellor.Property.Docker.Shim as DockerShim import Utility.FileMode import Utility.SafeCommand @@ -53,6 +54,7 @@ processCmdLine = go =<< getArgs defaultMain :: [HostName -> Maybe [Property]] -> IO () defaultMain getprops = do + DockerShim.cleanEnv checkDebugMode cmdline <- processCmdLine debug ["command line: ", show cmdline] -- cgit v1.2.3