summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess2014-04-04 02:06:19 -0400
committerJoey Hess2014-04-04 02:06:19 -0400
commita3206d45d6fe161091d008d39ec86a2263d95446 (patch)
tree14ddb02de6f8760758d8ecc63df7f961a6dcfb78
parent49383915e73e0082d4050359378002b6f2d277f7 (diff)
redo a change I lost somewhere
fixes ghc spain in i386 container on amd64 host
-rw-r--r--Propellor/CmdLine.hs2
-rw-r--r--Propellor/Property/Docker/Shim.hs5
2 files changed, 6 insertions, 1 deletions
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]
diff --git a/Propellor/Property/Docker/Shim.hs b/Propellor/Property/Docker/Shim.hs
index 01c2b22f..c2f35d0c 100644
--- a/Propellor/Property/Docker/Shim.hs
+++ b/Propellor/Property/Docker/Shim.hs
@@ -3,7 +3,7 @@
--
-- Note: This is currently Debian specific, due to glibcLibs.
-module Propellor.Property.Docker.Shim (setup, file) where
+module Propellor.Property.Docker.Shim (setup, cleanEnv, file) where
import Propellor
import Utility.LinuxMkLibs
@@ -44,6 +44,9 @@ setup propellorbin dest = do
modifyFileMode shim (addModes executeModes)
return shim
+cleanEnv :: IO ()
+cleanEnv = void $ unsetEnv "GCONV_PATH"
+
file :: FilePath -> FilePath -> FilePath
file propellorbin dest = dest </> takeFileName propellorbin