cadey
/
propellor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

redo a change I lost somewhere 

fixes ghc spain in i386 container on amd64 host
This commit is contained in:
Joey Hess 2014-04-04 02:06:19 -04:00
parent 49383915e7
commit a3206d45d6
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Propellor/CmdLine.hs
View File

@ -11,6 +11,7 @@ import System.PosixCompat
import Propellor import Propellor
import qualified Propellor.Property.Docker as Docker import qualified Propellor.Property.Docker as Docker
import qualified Propellor.Property.Docker.Shim as DockerShim
import Utility.FileMode import Utility.FileMode
import Utility.SafeCommand import Utility.SafeCommand
@ -53,6 +54,7 @@ processCmdLine = go =<< getArgs
defaultMain :: [HostName -> Maybe [Property]] -> IO () defaultMain :: [HostName -> Maybe [Property]] -> IO ()
defaultMain getprops = do defaultMain getprops = do
DockerShim.cleanEnv
checkDebugMode checkDebugMode
cmdline <- processCmdLine cmdline <- processCmdLine
debug ["command line: ", show cmdline] debug ["command line: ", show cmdline]

5
Propellor/Property/Docker/Shim.hs
View File

@ -3,7 +3,7 @@
-- --
-- Note: This is currently Debian specific, due to glibcLibs. -- 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 Propellor
import Utility.LinuxMkLibs import Utility.LinuxMkLibs
@ -44,6 +44,9 @@ setup propellorbin dest = do
modifyFileMode shim (addModes executeModes) modifyFileMode shim (addModes executeModes)
return shim return shim
cleanEnv :: IO ()
cleanEnv = void $ unsetEnv "GCONV_PATH"
file :: FilePath -> FilePath -> FilePath file :: FilePath -> FilePath -> FilePath
file propellorbin dest = dest </> takeFileName propellorbin file propellorbin dest = dest </> takeFileName propellorbin